moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-12 04:25:08 -05:00
Code Issues Releases Wiki Activity

smtp: use the upload buffer size for scratch buffer malloc

Browse Source 
... not the read buffer size, as that can be set smaller and thus cause
a buffer overflow! CVE-2018-0500

Reported-by: Peter Wu
Bug: https://curl.haxx.se/docs/adv_2018-70a2.html
This commit is contained in:
Daniel Stenberg 2018-06-13 12:24:40 +02:00
parent 0b4ccc97f2
commit ba1dbd78e5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/smtp.c
View File

@ -1563,13 +1563,14 @@ CURLcode Curl_smtp_escape_eob(struct connectdata *conn, const ssize_t nread)
if(!scratch || data->set.crlf) { if(!scratch || data->set.crlf) {
oldscratch = scratch; oldscratch = scratch;
scratch = newscratch = malloc(2 * data->set.buffer_size); scratch = newscratch = malloc(2 * UPLOAD_BUFSIZE);
if(!newscratch) { if(!newscratch) {
failf(data, "Failed to alloc scratch buffer!"); failf(data, "Failed to alloc scratch buffer!");
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
} }
DEBUGASSERT(UPLOAD_BUFSIZE >= nread);
/* Have we already sent part of the EOB? */ /* Have we already sent part of the EOB? */
eob_sent = smtp->eob; eob_sent = smtp->eob;