From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 28 Sep 2016 08:15:34 +0000 (+0200)
Subject: aprintf: detect wrap-around when growing allocation
X-Git-Tag: curl-7_51_0~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8732ec40db652c53fa58cd13e2acb8eab6e40874;p=curl

aprintf: detect wrap-around when growing allocation

On 32bit systems we could otherwise wrap around after 2GB and allocate 0
bytes and crash.

CVE-2016-8618

Bug: https://curl.haxx.se/docs/adv_20161102D.html
Reported-by: Cure53
---

diff --git a/lib/mprintf.c b/lib/mprintf.c
index dbedeaa18..2c88aa833 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -1036,16 +1036,19 @@ static int alloc_addbyter(int output, FILE *data)
     infop->len =0;
   }
   else if(infop->len+1 >= infop->alloc) {
-    char *newptr;
+    char *newptr = NULL;
+    size_t newsize = infop->alloc*2;
 
-    newptr = realloc(infop->buffer, infop->alloc*2);
+    /* detect wrap-around or other overflow problems */
+    if(newsize > infop->alloc)
+      newptr = realloc(infop->buffer, newsize);
 
     if(!newptr) {
       infop->fail = 1;
       return -1; /* fail */
     }
     infop->buffer = newptr;
-    infop->alloc *= 2;
+    infop->alloc = newsize;
   }
 
   infop->buffer[ infop->len ] = outc;