Changeset 889 for trunk/zoo-project/zoo-kernel/ulinet.c
- Timestamp:
- Jan 3, 2019, 12:44:57 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/ulinet.c
r841 r889 91 91 ; 92 92 #endif 93 tmp=strtok( buffer,";");93 tmp=strtok((char*) buffer,";"); // knut: added cast to char* 94 94 cnt=0; 95 95 psInternet=(_HINTERNET *)data; … … 247 247 char *token, *saveptr; 248 248 int cnt; 249 char* host; 250 token = strtok_r (url, "//", &saveptr); 249 char* host; 250 251 // knut: make a copy of url since strtok family modifies first argument and cannot be used on constant strings 252 char* urlcpy = (char*) malloc(sizeof(char)*(strlen(url)+1)); 253 urlcpy = strncpy(urlcpy, url, strlen(url)+1); // since count > strlen(url), a null character is properly appended 254 255 //token = strtok_r (url, "//", &saveptr); 256 token = strtok_r (urlcpy, "//", &saveptr); // knut 251 257 cnt=0; 252 258 while(token!=NULL && cnt<=1){ … … 257 263 if(cnt==1 && strstr(protectedHosts,token)!=NULL){ 258 264 fprintf(stderr,"%s %d %s \n",__FILE__,__LINE__,strstr(protectedHosts,token)); 265 free(urlcpy); 259 266 return 1; 260 267 } … … 262 269 cnt+=1; 263 270 } 271 free(urlcpy); 264 272 return 0; 265 273 }
Note: See TracChangeset
for help on using the changeset viewer.