diff options
| author | dartraiden <wowemuh@gmail.com> | 2021-07-29 03:58:47 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2021-07-29 04:00:29 +0300 |
| commit | fe19d22eaddb5383337114ab7a611d781de24b59 (patch) | |
| tree | 618312785cafc338b2f3369184ef17364c20e6ec /libs/libcurl/src/formdata.c | |
| parent | d60a8d0c45ea7903274c570f523b7775125f4e89 (diff) | |
libcurl: update to 7.78
Diffstat (limited to 'libs/libcurl/src/formdata.c')
| -rw-r--r-- | libs/libcurl/src/formdata.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libs/libcurl/src/formdata.c b/libs/libcurl/src/formdata.c index 769f06a705..ac7a0009cd 100644 --- a/libs/libcurl/src/formdata.c +++ b/libs/libcurl/src/formdata.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -865,8 +865,6 @@ CURLcode Curl_getformdata(struct Curl_easy *data, if(post->flags & CURL_HTTPPOST_LARGE) clen = post->contentlen; - if(!clen) - clen = -1; if(post->flags & (HTTPPOST_FILENAME | HTTPPOST_READFILE)) { if(!strcmp(file->contents, "-")) { @@ -888,13 +886,21 @@ CURLcode Curl_getformdata(struct Curl_easy *data, else if(post->flags & HTTPPOST_BUFFER) result = curl_mime_data(part, post->buffer, post->bufferlength? post->bufferlength: -1); - else if(post->flags & HTTPPOST_CALLBACK) + else if(post->flags & HTTPPOST_CALLBACK) { /* the contents should be read with the callback and the size is set with the contentslength */ + if(!clen) + clen = -1; result = curl_mime_data_cb(part, clen, fread_func, NULL, NULL, post->userp); + } else { - result = curl_mime_data(part, post->contents, (ssize_t) clen); + size_t uclen; + if(!clen) + uclen = CURL_ZERO_TERMINATED; + else + uclen = (size_t)clen; + result = curl_mime_data(part, post->contents, uclen); #ifdef CURL_DOES_CONVERSIONS /* Convert textual contents now. */ if(!result && data && part->datasize) |