diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/Curl/formdata.c | 12 | ||||
| -rw-r--r-- | Source/CTest/Curl/ftp.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Source/CTest/Curl/formdata.c b/Source/CTest/Curl/formdata.c index 42ed0ec..8f9b41e 100644 --- a/Source/CTest/Curl/formdata.c +++ b/Source/CTest/Curl/formdata.c @@ -626,9 +626,15 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost, { /* this "cast increases required alignment of target type" but we consider it OK anyway */ - struct curl_slist* list = array_state? - (struct curl_slist*)array_value: - va_arg(params, struct curl_slist*); + struct curl_slist* list = 0; + if ( array_state ) + { + memcpy(&list, &array_value, sizeof(struct curl_slist*)); + } + else + { + list = va_arg(params, struct curl_slist*); + } if( current_form->contentheader ) return_value = CURL_FORMADD_OPTION_TWICE; diff --git a/Source/CTest/Curl/ftp.c b/Source/CTest/Curl/ftp.c index eb26895..567c166 100644 --- a/Source/CTest/Curl/ftp.c +++ b/Source/CTest/Curl/ftp.c @@ -2692,7 +2692,7 @@ CURLcode ftp_regular_transfer(struct connectdata *conn) cur_pos = slash_pos + 1; /* jump to the rest of the string */ if(++ftp->dirdepth >= ftp->diralloc) { /* enlarge array */ - char *bigger; + char **bigger; ftp->diralloc *= 2; /* double the size each time */ bigger = realloc(ftp->dirs, ftp->diralloc * sizeof(ftp->dirs[0])); if(!bigger) { |