Changeset 606 for branches/PublicaMundi_David-devel/zoo-project

Timestamp:

Mar 11, 2015, 11:55:20 AM (10 years ago)

Author:

david

Message:

fix leak

Location:

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel

Files:

• zoo_json.c (modified) (2 diffs)
• zoo_json.h (modified) (1 diff)

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/zoo_json.c

@@ -33 +33 @@
 
 map* jsontomap(json_object * jobj){
-    map *m;
+    map *m = (map *) malloc (MAP_SIZE);
+    int i = 0;
     json_object_object_foreach(jobj, key, val){
         if (json_object_is_type(val, json_type_string)){
-            addMapToMap(&m,createMap(key,json_object_get_string(val)));
+            if (i==0){
+                m->name = zStrdup(key);
+                m->value = zStrdup(json_object_get_string(val));
+                m->next = NULL;
+                i = 1;
+            }
+            else {
+                map *tmp=createMap(key,json_object_get_string(val));
+                addMapToMap(&m,tmp);
+                freeMap(&tmp);
+                free(tmp);
+           }
         }
         else {
+            fprintf(stderr,"jsontomap not map :%s \n",key);
             /* Attention ce n'est pas une map */
             return NULL;
@@ -46 +59 @@
 }
 
-int jsontomaps(json_object * jobj,maps ** m){
-    maps *maps_tmp;
+maps * jsontomaps(json_object * jobj){
+    maps *mm = (maps *) malloc (MAPS_SIZE); 
+    int i =0;
     json_object_object_foreach(jobj, key, val){
-        maps_tmp = (maps *) malloc (MAPS_SIZE);
-        maps_tmp->content = jsontomap(val); 
-        maps_tmp->name = zStrdup(key);
-        addMapsToMaps(m,maps_tmp);
+        if (i ==0){
+            mm->content = jsontomap(val);
+            mm->name = zStrdup(key);
+            mm->next = NULL;
+            i = 1;
+        }
+        else {
+            maps *maps_tmp;
+            maps_tmp = (maps *) malloc (MAPS_SIZE);
+            maps_tmp->content = jsontomap(val); 
+            maps_tmp->name = zStrdup(key);
+            maps_tmp->next = NULL;
+            addMapsToMaps(&mm,maps_tmp);
+            freeMaps(&maps_tmp);
+            free(maps_tmp);
+            maps_tmp = NULL;
+       }
     }
-    return 0;
+    return mm;
 }
  

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/zoo_json.h

@@ -11 +11 @@
 
 map* jsontomap(json_object * jobj);
-int jsontomaps(json_object * jobj,maps **m);
+maps*  jsontomaps(json_object * jobj);
 
 #endif