Changeset 503 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Sep 22, 2014, 6:36:15 PM (9 years ago)

Author:

djay

Message:

Fix DescribeProcess? for services with prefixed identifier.

File:

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

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

@@ -3097 +3097 @@
     sprintf(key,"sprefix_%d",i);
     map* tmp00=getMapFromMaps(conf,"lenv",key);
-    sprintf(buffer,"%s/%s",tmp0,tmp00->value);
+    if(tmp00!=NULL)
+      sprintf(buffer,"%s/%s",tmp0,tmp00->value);
     free(tmp0);
     buffer[strlen(buffer)-1]=0;
@@ -3104 +3105 @@
       if(tmpMap==NULL || strlen(tmpMap->value)==0){
         char *tmp01=zStrdup(tmp00->value);
-        tmp01[strlen(tmp01)-1]=0;
         setMapInMaps(conf,"lenv","metapath",tmp01);
         free(tmp01);
+        tmp01=NULL;
       }
       else{
-        char *value=(char*)malloc((strlen(tmp00->value)+strlen(tmpMap->value)+2)*sizeof(char));
-        sprintf(value,"%s/%s",tmpMap->value,tmp00->value);
-        value[strlen(value)-1]=0;
-        setMapInMaps(conf,"lenv","metapath",value);
-        free(value);
+        if(tmp00!=NULL && tmpMap!=NULL){
+          char *value=(char*)malloc((strlen(tmp00->value)+strlen(tmpMap->value)+2)*sizeof(char));
+          sprintf(value,"%s/%s",tmpMap->value,tmp00->value);
+          setMapInMaps(conf,"lenv","metapath",value);
+          free(value);
+          value=NULL;
+        }
       }
     }else{