Changeset 510 for trunk

Timestamp:

Oct 16, 2014, 10:02:46 AM (10 years ago)

Author:

djay

Message:

Fix leaks in ZOO-Kernel.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (1 diff)
• zoo_loader.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (2 diffs)

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

@@ -3225 +3225 @@
           fcontent[hInternet->ihandle[index].nDataLen]=0;
           fsize=hInternet->ihandle[index].nDataLen;
-          mimeType=strdup((char*)hInternet->ihandle[index].mimeType);
+          if(hInternet->ihandle[index].mimeType==NULL)
+            mimeType=strdup("none");
+          else
+            mimeType=strdup((char*)hInternet->ihandle[index].mimeType);
           
           map* tmpMap=getMapOrFill(&content->content,"value","");

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

@@ -97 +97 @@
        while((r=fread(buffer,sizeof(char),1,cgiIn))){
          buffer[1]=0;
-         cgiContentLength+=r;
          if(res==NULL){
            res=(char*)malloc(2*sizeof(char));
@@ -103 +102 @@
          }
          else{
-           char *tmp=zStrdup(res);
-           res=(char*)realloc(res,(strlen(tmp)+2)*sizeof(char));
-           sprintf(res,"%s%s",tmp,buffer);
-           free(tmp);
+           res=(char*)realloc(res,(cgiContentLength+2)*sizeof(char));
+           memcpy(res + cgiContentLength, buffer, sizeof(char));
+           res[cgiContentLength+1]=0;
          }
+         cgiContentLength+=r;
        }
        delete[] buffer;

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

@@ -1981 +1981 @@
     tmps=tmpsptr->nodesetval;
     if(tmps->nodeNr==0){
+      xmlXPathFreeObject(tmpsptr);
       tmpsptr=extractFromDoc(doc,"/*/*/*[local-name()='RawDataOutput']");
       tmps=tmpsptr->nodesetval;
@@ -2031 +2032 @@
             free(tmpmaps->name);
             tmpmaps->name=zStrdup((char*)val);
+            xmlFree(val);
           }
           cur2=cur2->next;