[GNUnet-SVN] [gnurl] 161/178: http: restore buffer pointer when bad response-line is parsed

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 8c7b3737d29ed5c0575bf592063de8a51450812d
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Mar 24 23:47:41 2018 +0100

    http: restore buffer pointer when bad response-line is parsed
    
    ... leaving the k->str could lead to buffer over-reads later on.
    
    CVE: CVE-2018-1000301
    Assisted-by: Max Dymond
    
    Detected by OSS-Fuzz.
    Bug: https://curl.haxx.se/docs/adv_2018-b138.html
    Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7105
---
 lib/http.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/http.c b/lib/http.c
index 1a313b4fb..e080ae513 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -3014,6 +3014,8 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy 
*data,
 {
   CURLcode result;
   struct SingleRequest *k = &data->req;
+  ssize_t onread = *nread;
+  char *ostr = k->str;
 
   /* header line within buffer loop */
   do {
@@ -3078,7 +3080,9 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy 
*data,
         else {
           /* this was all we read so it's all a bad header */
           k->badheader = HEADER_ALLBAD;
-          *nread = (ssize_t)rest_length;
+          *nread = onread;
+          k->str = ostr;
+          return CURLE_OK;
         }
         break;
       }

-- 
To stop receiving notification emails like this one, please contact
address@hidden