generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to silence bogus compiler warning: "Potential null pointer dereference"

Browse Source
This commit is contained in:
Yang Tse 2009-10-08 12:44:25 +00:00
parent 4798f4e652
commit 0077a6d51b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/formdata.c
View File

@ -423,7 +423,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
while(return_value == CURL_FORMADD_OK) { while(return_value == CURL_FORMADD_OK) {
/* first see if we have more parts of the array param */ /* first see if we have more parts of the array param */
if( array_state ) { if( array_state && forms ) {
/* get the upcoming option from the given array */ /* get the upcoming option from the given array */
option = forms->option; option = forms->option;
array_value = (char *)forms->value; array_value = (char *)forms->value;

6
lib/url.c
View File

@ -3681,7 +3681,7 @@ static CURLcode parse_proxy(struct SessionHandle *data,
char *endofprot; char *endofprot;
/* We use 'proxyptr' to point to the proxy name from now on... */ /* We use 'proxyptr' to point to the proxy name from now on... */
char *proxyptr=proxy; char *proxyptr;
char *portptr; char *portptr;
char *atsign; char *atsign;
@ -3691,9 +3691,11 @@ static CURLcode parse_proxy(struct SessionHandle *data,
*/ */
/* Skip the protocol part if present */ /* Skip the protocol part if present */
endofprot=strstr(proxyptr, "://"); endofprot = strstr(proxy, "://");
if(endofprot) if(endofprot)
proxyptr = endofprot+3; proxyptr = endofprot+3;
else
proxyptr = proxy;
/* Is there a username and password given in this proxy url? */ /* Is there a username and password given in this proxy url? */
atsign = strchr(proxyptr, '@'); atsign = strchr(proxyptr, '@');