From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 27 Sep 2016 22:05:12 +0000 (+0200)
Subject: base64: check for integer overflow on large input
X-Git-Tag: curl-7_51_0~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efd24d57426bd77c9b5860e6b297904703750412;p=thirdparty%2Fcurl.git

base64: check for integer overflow on large input

CVE-2016-8617

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

diff --git a/lib/base64.c b/lib/base64.c
index ad254595f4..204a2273d1 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -190,6 +190,11 @@ static CURLcode base64_encode(const char *table64,
   if(!insize)
     insize = strlen(indata);
 
+#if SIZEOF_SIZE_T == 4
+  if(insize > UINT_MAX/4)
+    return CURLE_OUT_OF_MEMORY;
+#endif
+
   base64data = output = malloc(insize * 4 / 3 + 4);
   if(!output)
     return CURLE_OUT_OF_MEMORY;