[certi-cvs] applications/PyHLA/hla/_rti federateambassador.cpp

certi-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/PyHLA/hla/_rti federateambassador.cpp

From:	certi-cvs
Subject:	[certi-cvs] applications/PyHLA/hla/_rti federateambassador.cpp
Date:	Fri, 01 Oct 2010 19:56:40 +0000
CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Petr Gotthard <gotthardp>       10/10/01 19:56:40

Modified files:
        PyHLA/hla/_rti : federateambassador.cpp 

Log message:
        Bug #30989: Another memory allocation bug fixed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/federateambassador.cpp?cvsroot=certi&r1=1.5&r2=1.6

Patches:
Index: federateambassador.cpp
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/federateambassador.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- federateambassador.cpp      4 Nov 2008 08:32:36 -0000       1.5
+++ federateambassador.cpp      1 Oct 2010 19:56:39 -0000       1.6
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: federateambassador.cpp,v 1.5 2008/11/04 08:32:36 gotthardp Exp $
+ * $Id: federateambassador.cpp,v 1.6 2010/10/01 19:56:39 gotthardp Exp $
  */
 
 // note: you must include Python.h before any standard headers are included
@@ -77,8 +77,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "s",
+    PyObject *res = PyObject_CallFunction(func, "s",
         label);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -95,7 +98,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "s", label);
+    PyObject *res = PyObject_CallFunction(func, "s", label);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -112,7 +118,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "ss", label, tag);
+    PyObject *res = PyObject_CallFunction(func, "ss", label, tag);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -129,7 +138,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "s", label);
+    PyObject *res = PyObject_CallFunction(func, "s", label);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -146,7 +158,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "s", label);
+    PyObject *res = PyObject_CallFunction(func, "s", label);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -164,7 +179,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, NULL);
+    PyObject *res = PyObject_CallFunction(func, NULL);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -181,7 +199,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, NULL);
+    PyObject *res = PyObject_CallFunction(func, NULL);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -198,7 +219,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "s", label);
+    PyObject *res = PyObject_CallFunction(func, "s", label);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -215,7 +239,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "ss", label, reason);
+    PyObject *res = PyObject_CallFunction(func, "ss", label, reason);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -232,7 +259,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, NULL);
+    PyObject *res = PyObject_CallFunction(func, NULL);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -249,9 +279,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "sO&",
+    PyObject *res = PyObject_CallFunction(func, "sO&",
         label,
         RtiFederateHandle_ToPython, &handle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -270,7 +303,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, NULL);
+    PyObject *res = PyObject_CallFunction(func, NULL);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -287,7 +323,10 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, NULL);
+    PyObject *res = PyObject_CallFunction(func, NULL);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -306,8 +345,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&",
+    PyObject *res = PyObject_CallFunction(func, "O&",
         RtiObjectClassHandle_ToPython, &theClass);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -325,8 +367,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&",
+    PyObject *res = PyObject_CallFunction(func, "O&",
         RtiObjectClassHandle_ToPython, &theClass);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -344,8 +389,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&",
+    PyObject *res = PyObject_CallFunction(func, "O&",
         RtiInteractionClassHandle_ToPython, &theHandle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -363,8 +411,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&",
+    PyObject *res = PyObject_CallFunction(func, "O&",
         RtiInteractionClassHandle_ToPython, &theHandle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -385,10 +436,13 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&s",
+    PyObject *res = PyObject_CallFunction(func, "O&O&s",
         RtiObjectHandle_ToPython, &theObject,
         RtiObjectClassHandle_ToPython, &theObjectClass,
         theObjectName);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -413,7 +467,7 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&sOOdO&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&sOOdO&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleValuePairSet_ToPython, &theAttributes,
         theTag,
@@ -421,6 +475,9 @@
         RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theAttributes.getTransportType(0)),
         time.getTime(),
         EventRetractionHandle_ToPython, &theHandle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -443,12 +500,15 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&sOO",
+    PyObject *res = PyObject_CallFunction(func, "O&O&sOO",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleValuePairSet_ToPython, &theAttributes,
         theTag,
         RtiULongHandle_FromULong(&RtiOrderingHandleType, 
theAttributes.getOrderType(0)),
         RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theAttributes.getTransportType(0)));
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -475,7 +535,7 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&sOOdO&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&sOOdO&",
         RtiInteractionClassHandle_ToPython, &theInteraction,
         ParameterHandleValuePairSet_ToPython, &theParameters,
         theTag,
@@ -483,6 +543,9 @@
         RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theParameters.getTransportType()),
         time.getTime(),
         EventRetractionHandle_ToPython, &theHandle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -504,12 +567,15 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&sOO",
+    PyObject *res = PyObject_CallFunction(func, "O&O&sOO",
         RtiInteractionClassHandle_ToPython, &theInteraction,
         ParameterHandleValuePairSet_ToPython, &theParameters,
         theTag,
         RtiULongHandle_FromULong(&RtiOrderingHandleType, 
theParameters.getOrderType()),
         RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theParameters.getTransportType()));
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -531,11 +597,14 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&sdO&",
+    PyObject *res = PyObject_CallFunction(func, "O&sdO&",
         RtiObjectHandle_ToPython, &theObject,
         theTag,
         time.getTime(),
         EventRetractionHandle_ToPython, &theHandle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -554,9 +623,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&s",
+    PyObject *res = PyObject_CallFunction(func, "O&s",
         RtiObjectHandle_ToPython, &theObject,
         theTag);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -574,9 +646,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -595,9 +670,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -617,9 +695,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -639,9 +720,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -660,9 +744,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -685,10 +772,13 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&s",
+    PyObject *res = PyObject_CallFunction(func, "O&O&s",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &offeredAttributes,
         theTag);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -711,9 +801,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &releasedAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -736,9 +829,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &securedAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -761,9 +857,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -786,10 +885,13 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&s",
+    PyObject *res = PyObject_CallFunction(func, "O&O&s",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &candidateAttribute,
         theTag);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -811,9 +913,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleSet_ToPython, &theAttributes);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -835,10 +940,13 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&O&",
         RtiObjectHandle_ToPython, &theObject,
         RtiAttributeHandle_ToPython, &theAttribute,
         RtiFederateHandle_ToPython, &theOwner);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -857,9 +965,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         RtiAttributeHandle_ToPython, &theAttribute);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -878,9 +989,12 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&O&",
+    PyObject *res = PyObject_CallFunction(func, "O&O&",
         RtiObjectHandle_ToPython, &theObject,
         RtiAttributeHandle_ToPython, &theAttribute);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -903,8 +1017,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "d",
+    PyObject *res = PyObject_CallFunction(func, "d",
         time.getTime());
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -925,8 +1042,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "d",
+    PyObject *res = PyObject_CallFunction(func, "d",
         time.getTime());
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -947,8 +1067,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "d",
+    PyObject *res = PyObject_CallFunction(func, "d",
         time.getTime());
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -967,8 +1090,11 @@
     if(func == NULL)
         return; // callback not defined
 
-    PyObject_CallFunction(func, "O&",
+    PyObject *res = PyObject_CallFunction(func, "O&",
         EventRetractionHandle_ToPython, &theHandle);
+    if(res != NULL)
+      Py_XDECREF(res); // ignore the result
+
     Py_XDECREF(func);
 
     if(PyObject *exception = PyErr_Occurred()) {
@@ -1051,4 +1177,4 @@
     PyModule_AddObject(module, "FederateAmbassador", (PyObject 
*)&FederateAmbassadorObjectType);
 }
 
-// $Id: federateambassador.cpp,v 1.5 2008/11/04 08:32:36 gotthardp Exp $
+// $Id: federateambassador.cpp,v 1.6 2010/10/01 19:56:39 gotthardp Exp $
[Prev in Thread]
Current Thread
[Next in Thread]
[certi-cvs] applications/PyHLA/hla/_rti federateambassador.cpp, certi-cvs <=
Next by Date: [certi-cvs] certi RTIG/RTIG.hh RTIG/RTIG.cc RTIG/RTIG_proce...
Next by thread: [certi-cvs] certi RTIG/RTIG.hh RTIG/RTIG.cc RTIG/RTIG_proce...
Index(es):
- Date
- Thread