Changeset 488 for trunk

Timestamp:

Jun 20, 2014, 1:43:28 PM (11 years ago)

Author:

djay

Message:

Small fixes in memory gesture.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (4 diffs)

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

@@ -216 +216 @@
 
       if(prefix!=NULL){
-        free(prefix);
         prefix=NULL;
       }
@@ -227 +226 @@
       if(prefix!=NULL){
         setMapInMaps(m,"lenv",tmp1,prefix);
-        char *cprefix=zStrdup(prefix);
         char levels1[17];
         sprintf(levels1,"%d",level+1);
         setMapInMaps(m,"lenv","level",levels1);
-        res=recursReaddirF(m,n,tmp,cprefix,saved_stdout,level+1,func);
+        res=recursReaddirF(m,n,tmp,prefix,saved_stdout,level+1,func);
         sprintf(levels1,"%d",level);
         setMapInMaps(m,"lenv","level",levels1);
         free(prefix);
         prefix=NULL;
-      }
+      }else
+        res=-1;
       free(tmp);
       if(res<0){
@@ -243 +242 @@
     }
     else{
-      char* tmp0=strdup(dp->d_name);
       if(dp->d_name[0]!='.' && strstr(dp->d_name,".zcfg")!=0){
         int t;
@@ -790 +788 @@
   if(request_inputs==NULL || r_inputs==NULL){ 
     errorException(m, _("Parameter <request> was not specified"),"MissingParameterValue","request");
+    freeMap(&request_inputs);
+    free(request_inputs);
     freeMaps(&m);
     free(m);