Changeset 59 for trunk/zoo-kernel/service_internal_python.c

Timestamp:

Jan 6, 2011, 10:50:56 PM (14 years ago)

Author:

djay

Message:

Small fix for binary string support in dupMaps function to ensure that the binary value willbe passed to various laguages correctly. Memory cleanup.

File:

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

trunk/zoo-kernel/service_internal_python.c

@@ -106 +106 @@
         freeMaps(real_outputs);
         free(*real_outputs);
-        //*real_inputs=mapsFromPyDict(arg2);
-        //createMapsFromPyDict(real_outputs,arg3);
+        freeMaps(main_conf);
+        free(*main_conf);
         *main_conf=mapsFromPyDict(arg1);
         *real_outputs=mapsFromPyDict(arg3);
@@ -134 +134 @@
         trace=NULL;
         trace=PyObject_Str(ptype);
-        if(PyString_Check(trace))
-          sprintf(pbt,"%s\nTRACE : %s",strdup(pbt),PyString_AsString(trace));
+        if(PyString_Check(trace)){
+          char *tpbt=strdup(pbt);
+          sprintf(pbt,"%s\nTRACE : %s",tpbt,PyString_AsString(trace));
+          free(tpbt);
+        }
         else
           fprintf(stderr,"EMPTY TRACE ?");
@@ -148 +151 @@
         trace=PyObject_Str(pValue);
         if(PyString_Check(trace))
-          sprintf(pbt,"%s\nUnable to run your python process properly. Please check the following messages : %s",strdup(pbt),PyString_AsString(trace));
+          sprintf(pbt,"%s\nUnable to run your python process properly. Please check the following messages : %s",pbt,PyString_AsString(trace));
         else
-          sprintf(pbt,"%s \n Unable to run your python process properly. Unable to provide any futher informations.",strdup(pbt));
+          sprintf(pbt,"%s \n Unable to run your python process properly. Unable to provide any futher informations.",pbt);
         map* err=createMap("text",pbt);
         addToMap(err,"code","NoApplicableCode");
         printExceptionReportResponse(m,err);
+        Py_DECREF(arg1);
+        Py_DECREF(arg2);
+        Py_DECREF(arg3);
         Py_XDECREF(pFunc);
         Py_DECREF(pArgs);
         Py_DECREF(pModule);
+        Py_DECREF(ptraceback);
+        Py_DECREF(ptype);
+        Py_DECREF(pValue);
+        Py_Finalize();
         exit(-1);
       }
@@ -178 +188 @@
     exit(-1);
   } 
-#ifndef DEBUG
-  // Failed when DEBUG is defined
   Py_Finalize();
-#endif
   return res;
 }
@@ -189 +196 @@
   maps* tmp=t;
   while(tmp!=NULL){
-    if(PyDict_SetItem(res,PyString_FromString(tmp->name),(PyObject*)PyDict_FromMap(tmp->content))<0){
+    PyObject* subc=PyDict_FromMap(tmp->content);
+    if(PyDict_SetItem(res,PyString_FromString(tmp->name),subc)<0){
       fprintf(stderr,"Unable to parse params...");
       exit(1);
     }
+    Py_DECREF(subc);
     tmp=tmp->next;
   }  
@@ -202 +211 @@
   map* tmp=t;
   map* size=getMap(tmp,"size");
-  dumpMap(t);
   while(tmp!=NULL){
-    fprintf(stderr,"%s => %s\n"),tmp->name,tmp->value;
+    PyObject* name=PyString_FromString(tmp->name);
     if(strcasecmp(tmp->name,"value")==0){
       if(size!=NULL){
-        if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromStringAndSize(tmp->value,(Py_ssize_t) atoi(size->value)))<0){
+        PyObject* value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
+        if(PyDict_SetItem(res,name,value)<0){
           fprintf(stderr,"Unable to parse params...");
           exit(1);
         }
+        Py_DECREF(value);
       }
-      else
-        if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
+      else{
+        PyObject* value=PyString_FromString(tmp->value);
+        if(PyDict_SetItem(res,name,value)<0){
           fprintf(stderr,"Unable to parse params...");
           exit(1);
         }
-    } 
-    else
-      if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
+        Py_DECREF(value);
+      }
+    }
+    else{
+      PyObject* value=PyString_FromString(tmp->value);
+      if(PyDict_SetItem(res,name,value)<0){
         fprintf(stderr,"Unable to parse params...");
         exit(1);
       }
+      Py_DECREF(value);
+    }
+    Py_DECREF(name);
     tmp=tmp->next;
   }
@@ -244 +261 @@
             PyString_AsString(key),PyString_AsString(value));
 #endif
-    while(cursor!=NULL){
-      cursor=cursor->next;
-    }
     cursor=(maps*)malloc(MAPS_SIZE);
     cursor->name=PyString_AsString(key);
@@ -255 +269 @@
     cursor->next=NULL;
     if(res==NULL)
-      res=cursor;
+      res=dupMaps(&cursor);
     else
       addMapsToMaps(&res,cursor);
+    freeMap(&cursor->content);
+    free(cursor->content);
+    free(cursor);
 #ifdef DEBUG
     dumpMaps(res);
@@ -263 +280 @@
 #endif
   }
+  Py_DECREF(list);
   return res;
 }