Changeset 471 for trunk/zoo-project/zoo-kernel/service_internal_python.c

Timestamp:

May 10, 2014, 4:23:03 PM (10 years ago)

Author:

djay

Message:

Remove leaks from DescribeProcess? and JavaScript? support. Fix wrong ulinet update on previous commit. Use the new updateStatus/setOutputValue functions as described in #88 from longProcess. Add default value for QREncode service in ZCFG. Fix name of profile service in the ZCFG file.

File:

• trunk/zoo-project/zoo-kernel/service_internal_python.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/service_internal_python.c

@@ -389 +389 @@
         PyObject* value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
         if(PyDict_SetItem(res,name,value)<0){
+          Py_DECREF(value);
           fprintf(stderr,"Unable to set key value pair...");
           return NULL;
         }
+        Py_DECREF(value);
       }
       else{
         PyObject* value=PyString_FromString(tmp->value);
         if(PyDict_SetItem(res,name,value)<0){
+          Py_DECREF(value);
           fprintf(stderr,"Unable to set key value pair...");
           return NULL;
         }
+        Py_DECREF(value);
       }
     }
@@ -405 +409 @@
         PyObject* value=PyString_FromString(tmp->value);
         if(PyDict_SetItem(res,name,value)<0){
+          Py_DECREF(value);
           fprintf(stderr,"Unable to set key value pair...");
           return NULL;
         }
+        Py_DECREF(value);
       }
     }
@@ -446 +452 @@
     free(cursor->content);
     free(cursor);
+    Py_DECREF(key);
 #ifdef DEBUG
     dumpMaps(res);
@@ -489 +496 @@
       addToMap(res,"size",sin);
     }else{
+      char* lkey=PyString_AsString(key);
+      char* lvalue=PyString_AsString(value);
       if(res!=NULL){
         if(PyString_Size(value)>0)
-          addToMap(res,PyString_AsString(key),PyString_AsString(value));
+          addToMap(res,lkey,lvalue);
       }
       else{
         if(PyString_Size(value)>0)
-          res=createMap(PyString_AsString(key),PyString_AsString(value));
-      }
-    }
+          res=createMap(lkey,lvalue);
+      }
+    }
+    Py_DECREF(value);
+    Py_DECREF(key);
   }
   return res;
@@ -554 +565 @@
     else
       setMapInMaps(conf,"lenv","status","15");
-    updateStatus(conf);
+    _updateStatus(conf);
   }
   freeMaps(&conf);