diff options
| -rw-r--r-- | lib/formdata.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/formdata.c b/lib/formdata.c index ab5f99118..9b458c0e2 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -423,7 +423,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost, while(return_value == CURL_FORMADD_OK) { /* 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 */ option = forms->option; array_value = (char *)forms->value; @@ -3681,7 +3681,7 @@ static CURLcode parse_proxy(struct SessionHandle *data, char *endofprot; /* We use 'proxyptr' to point to the proxy name from now on... */ - char *proxyptr=proxy; + char *proxyptr; char *portptr; char *atsign; @@ -3691,9 +3691,11 @@ static CURLcode parse_proxy(struct SessionHandle *data, */ /* Skip the protocol part if present */ - endofprot=strstr(proxyptr, "://"); + endofprot = strstr(proxy, "://"); if(endofprot) proxyptr = endofprot+3; + else + proxyptr = proxy; /* Is there a username and password given in this proxy url? */ atsign = strchr(proxyptr, '@'); |