Changeset 910 for branches

Timestamp:

May 4, 2019, 5:54:29 PM (6 years ago)

Author:

djay

Message:

Fixx issue in server_internal.c

File:

• branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c (modified) (1 diff)

branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c

@@ -379 +379 @@
   rewind(file);
   if(getMap(content,"storage")==NULL){
-    map* tmpMap1=getMap(content,"value");
-    if(tmpMap1==NULL){
-      addToMap(content,"value","");
-      tmpMap1=getMap(content,"value");
-    }
-    free(tmpMap1->value);
-    tmpMap1->value=(char*) malloc((count+1)*sizeof(char));
-    if(tmpMap1->value==NULL){
-      setMapInMaps(m,"lenv","message","Unable to allocate the memory required to read the produced file.");
-    }
-    fread(tmpMap1->value,1,count,file);
-    tmpMap1->value[count]=0;
+    map* memUse=getMapFromMaps(m,"main","memory");
+    if(memUse==NULL || strncmp(memUse->value,"load",4)==0){
+      map* tmpMap1=getMap(content,"value");
+      if(tmpMap1==NULL){
+        addToMap(content,"value","");
+        tmpMap1=getMap(content,"value");
+      }
+      free(tmpMap1->value);
+      tmpMap1->value=(char*) malloc((f_status.st_size+1)*sizeof(char));
+      if(tmpMap1->value==NULL){
+        setMapInMaps(m,"lenv","message","Unable to allocate the memory required to read the produced file.");
+      }
+      fread(&tmpMap1->value,1,f_status.st_size,file);
+      tmpMap1->value[f_status.st_size]=0;
+    }
   }
   fclose(file);