diff options
| author | Nils Gillmann <gillmann@gnunet.org> | 2018-05-23 10:24:02 +0000 |
|---|---|---|
| committer | Nils Gillmann <gillmann@gnunet.org> | 2018-05-23 10:24:02 +0000 |
| commit | 97f0e8cf8585325401b9d19e433131722f978984 (patch) | |
| tree | 935fa45929a646222b5abdd260a7bfd4be2cd836 /lib/mime.c | |
| parent | 422f18ebe7ad2cbcd5d45ed05ae02e959e4a7d8b (diff) | |
| parent | cb013830383f1ccc9757aba36bc32df5ec281c02 (diff) | |
| download | gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.gz gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.bz2 gnurl-97f0e8cf8585325401b9d19e433131722f978984.zip | |
Merge tag 'curl-7_60_0' (with fixes)
curl 7.60.0
Signed-off-by: Nils Gillmann <gillmann@gnunet.org>
Diffstat (limited to 'lib/mime.c')
| -rw-r--r-- | lib/mime.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/mime.c b/lib/mime.c index 4e48db7dd..cbb4a2ce5 100644 --- a/lib/mime.c +++ b/lib/mime.c @@ -241,7 +241,7 @@ static FILE * vmsfopenread(const char *file, const char *mode) static char *Curl_basename(char *path) { /* Ignore all the details above for now and make a quick and simple - implementaion here */ + implementation here */ char *s1; char *s2; @@ -1193,7 +1193,10 @@ CURLcode Curl_mime_duppart(curl_mimepart *dst, const curl_mimepart *src) } /* Duplicate other fields. */ - dst->encoder = src->encoder; + if(dst != NULL) + dst->encoder = src->encoder; + else + res = CURLE_WRITE_ERROR; if(!res) res = curl_mime_type(dst, src->mimetype); if(!res) @@ -1202,7 +1205,7 @@ CURLcode Curl_mime_duppart(curl_mimepart *dst, const curl_mimepart *src) res = curl_mime_filename(dst, src->filename); /* If an error occurred, rollback. */ - if(res) + if(res && dst) Curl_mime_cleanpart(dst); return res; |