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

Timestamp:

Feb 11, 2013, 1:52:15 PM (11 years ago)

Author:

djay

Message:

Add support for Python-3.3.0. Fix issue with cache handling. Fix issue with Cookie identifier detection.

File:

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

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

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- * Copyright (c) 2009-2012 GeoLabs SARL
+ * Copyright (c) 2009-2013 GeoLabs SARL
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2518 +2518 @@
     fprintf(stderr,"MD5STR : (%s)\n\n",md5str);
 #endif
-    char* fname=(char*)malloc(sizeof(char)*(strlen(tmpM->value)+50));
+    char* fname=(char*)malloc(sizeof(char)*(strlen(tmpM->value)+strlen(md5str)+6));
     sprintf(fname,"%s/%s.zca",tmpM->value,md5str);
     struct stat f_status;
@@ -2548 +2548 @@
       fcontent=(char*)malloc(sizeof(char)*(f_status.st_size+1));
       FILE* f=fopen(cached,"rb");
-      fread(fcontent,sizeof(char),f_status.st_size,f);
+      int len=fread(fcontent,f_status.st_size,1,f);
       fsize=f_status.st_size;
-      hasF=1;
+      fcontent[fsize]=0;
     }
   }else{
@@ -2558 +2558 @@
       return errorException(m, _("Unable to allocate memory."), "InternalError");
     }
-    hasF=1;
     size_t dwRead;
     InternetReadFile(res, (LPVOID)fcontent, res.nDataLen, &dwRead);
@@ -2574 +2573 @@
   if(tmpMap->value==NULL)
     fprintf(stderr,"Unable to allocate memory!\n");
-  memcpy(tmpMap->value,fcontent,(fsize)*sizeof(char));
+  //snprintf(tmpMap->value,(fsize+1)*sizeof(char),fcontent);
+  memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
   
   char ltmp1[256];
@@ -2582 +2582 @@
     addToCache(m,url,fcontent,fsize);
   else{
-    if(hasF)
-      free(fcontent);
     free(cached);
   }