Changeset 889 for trunk/zoo-project/zoo-kernel/ulinet.c

Timestamp:

Jan 3, 2019, 12:44:57 PM (5 years ago)

Author:

knut

Message:

Added some new logging functionality (function logMessage(), macros zooLog, zooLogMsg). Added utility functions setErrorMessage(), hasvalue(), and nonempty() in service.c. Added enum WPSException and arrays WPSExceptionText and WPSExceptionCode (see also function setErrorMessage). New conditional definition of type bool in service.c (to fix issue with bool). Null pointer check in function addToMap. Added missing return values and explicit type casts in some functions. Removed Windows-specific code in function dumpBackFinalFile (zoo_service_loader.c) that may cause error for async raw data output in formats other than XML.

File:

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

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

@@ -91 +91 @@
         ;
 #endif
-    tmp=strtok(buffer,";");
+    tmp=strtok((char*) buffer,";"); // knut: added cast to char*
     cnt=0;
     psInternet=(_HINTERNET *)data;
@@ -247 +247 @@
   char *token, *saveptr;
   int cnt;
-  char* host;  
-  token = strtok_r (url, "//", &saveptr);
+  char* host; 
+  
+  // knut: make a copy of url since strtok family modifies first argument and cannot be used on constant strings  
+  char* urlcpy = (char*) malloc(sizeof(char)*(strlen(url)+1)); 
+  urlcpy = strncpy(urlcpy, url, strlen(url)+1); // since count > strlen(url), a null character is properly appended
+ 
+  //token = strtok_r (url, "//", &saveptr);
+  token = strtok_r (urlcpy, "//", &saveptr);   // knut
   cnt=0;
   while(token!=NULL && cnt<=1){
@@ -257 +263 @@
     if(cnt==1 && strstr(protectedHosts,token)!=NULL){
       fprintf(stderr,"%s %d %s \n",__FILE__,__LINE__,strstr(protectedHosts,token));
+      free(urlcpy); 
       return 1;
     }
@@ -262 +269 @@
     cnt+=1;
   }
+  free(urlcpy);
   return 0;
 }