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

Timestamp:

Jul 13, 2015, 3:42:39 PM (9 years ago)

Author:

knut

Message:

Redefined the API function addToMapWithSize to fix problem with Python/PHP support. Added some variable initializations and NULL pointer checks.

File:

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

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

@@ -563 +563 @@
 
 /**
+ * Convert a Python dictionary to a maps 
+ *
+ * @param t the PyDictObject to convert
+ * @return a new maps containing the converted PyDictObject
+ * @warning make sure to free resources returned by this function
+ */
+maps* _mapsFromPyDict(PyDictObject* t){
+        
+        PyObject* list = PyDict_Keys((PyObject*)t); // new ref  
+        int nb = PyList_Size(list);     
+        
+        if (nb < 1) {
+                Py_DECREF(list);
+                return NULL;
+        }
+
+        maps* ptr = (maps*) malloc(MAPS_SIZE);
+        maps* res = ptr;        
+        
+        PyObject* key;
+        PyObject* value;
+        
+        for(int i = 0; i < nb; i++) {
+                
+                key = PyList_GetItem(list,i); // borrowed ref
+                value = PyDict_GetItem((PyObject*) t, key); // borrowed ref
+                
+                ptr->name = zStrdup(PyString_AsString(key));
+                ptr->content = mapFromPyDict((PyDictObject*) value);
+                
+                ptr->next = i < nb - 1 ? (maps*) malloc(MAPS_SIZE) : NULL;
+                ptr = ptr->next;
+        }
+        Py_DECREF(list);
+
+        return res;
+} // mapsFromPyDict
+
+/**
  * Convert a Python dictionary to a map 
  *
@@ -597 +636 @@
         }
         else{
+#ifdef DEBUG
           fprintf(stderr,"Unsupported return value.");
+#endif
           return NULL;
         }
 #else
       PyString_AsStringAndSize(value,&buffer,&size);
-#endif
-      addToMapWithSize(res,PyString_AsString(key),buffer,size);
+#endif      
+          res = addToMapWithSize(res,PyString_AsString(key),buffer,size);
     }else{
       char* lkey=PyString_AsString(key);
@@ -622 +663 @@
 
 /**
+ * Convert a Python dictionary to a map 
+ *
+ * @param t the PyDictObject to convert
+ * @return a new map containing the converted PyDictObject
+ * @warning make sure to free resources returned by this function
+ */
+map* _mapFromPyDict(PyDictObject* t) {
+        
+        PyObject* list = PyDict_Keys((PyObject*) t); // new ref
+        int nb = PyList_Size(list);
+        
+        if (nb < 1) {
+                Py_DECREF(list);
+                return NULL;
+        }       
+        
+        map* ptr = (map*) malloc(MAP_SIZE);
+        map* res = ptr;
+        
+        PyObject* key;
+        PyObject* value;
+        char *buffer = NULL;
+        Py_ssize_t size;
+        for(int i = 0; i < nb; i++) {
+                
+                key = PyList_GetItem(list, i); // borrowed ref
+                value = PyDict_GetItem((PyObject*) t, key); // borrowed ref             
+                                
+                ptr->name = zStrdup(PyString_AsString(key));            
+                map* msize = NULL;
+                
+        #if PY_MAJOR_VERSION >= 3
+                if (PyBytes_Check(value)) {
+                // value is byte array
+                        size = PyBytes_Size(value);                             
+                        buffer = PyBytes_AsString(value); // pointer to internal buffer
+                        char sz[32];
+                        sprintf(sz, "%d", (int) size);  
+                        msize = createMap("size", sz);                  
+                }
+                else if (PyUnicode_Check(value) && PyUnicode_READY(value) == 0) {
+                // value is string object               
+                        buffer = PyUnicode_AsUTF8AndSize(value, &size);
+                        size++;
+                }
+                else {
+                        printf("Type not recognized\n");
+                        // error handling
+                        // ...
+                }
+        #else   
+                PyString_AsStringAndSize(value, &buffer, &size);
+                size++;
+                // to do: handle byte arrays
+        #endif
+                
+                ptr->value = (char*) malloc(size); // check for NULL pointer
+                memmove(ptr->value, buffer, size);
+                        
+                if (msize != NULL) {
+                        ptr->next = msize;
+                        ptr = ptr->next;
+                }                                               
+                
+                ptr->next = i < nb - 1 ? (map*) malloc(MAP_SIZE) : NULL;
+                ptr = ptr->next;
+        }       
+        Py_DECREF(list);
+                        
+        return res;
+} // mapFromPyDict
+
+/**
  * Use the ZOO-Services messages translation function from the Python
  * environment