Changeset 961 for trunk/zoo-project/zoo-kernel/service.c

Timestamp:

Sep 8, 2020, 4:51:09 PM (4 years ago)

Author:

djay

Message:

Make sure not to try accessing mimetype and provenance in case a local file is used. Fix issue with addMapsToMaps. Produce value string only when memory=load for Python support. Make gdal/profile service usable in case memory=protect.

File:

• trunk/zoo-project/zoo-kernel/service.c (modified) (2 diffs)

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

@@ -328 +328 @@
     fprintf(stderr,"freeMap\n");
 #endif
-    free(_cursor->name);
-    free(_cursor->value);
+    if(_cursor->name!=NULL)
+      free(_cursor->name);
+    if(_cursor->value!=NULL)
+      free(_cursor->value);
     if(_cursor->next!=NULL){
       freeMap(&_cursor->next);
-      free(_cursor->next);
+      if(_cursor->next!=NULL)
+        free(_cursor->next);
     }
   }
@@ -825 +828 @@
     else{
       maps* tmp1=getMaps(*mo,tmp->name);
-      while(_cursor->next!=NULL)
-        _cursor=_cursor->next;
       if(tmp1==NULL){
+        while(_cursor->next!=NULL)
+          _cursor=_cursor->next;
         _cursor->next=dupMaps(&tmp);
         if(tmp->child!=NULL)