From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 25 Dec 2014 22:55:03 +0000 (+0100)
Subject: url-parsing: reject CRLFs within URLs
X-Git-Tag: curl-7_40_0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=178bd7db34f77e020fb8562890c5625ccbd67093;p=thirdparty%2Fcurl.git

url-parsing: reject CRLFs within URLs

Bug: http://curl.haxx.se/docs/adv_20150108B.html
Reported-by: Andrey Labunets
---

diff --git a/lib/url.c b/lib/url.c
index 788f04849d..d3bb5e0116 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3842,6 +3842,13 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data,
 
   *prot_missing = FALSE;
 
+  /* We might pass the entire URL into the request so we need to make sure
+   * there are no bad characters in there.*/
+  if(strpbrk(data->change.url, "\r\n")) {
+    failf(data, "Illegal characters found in URL");
+    return CURLE_URL_MALFORMAT;
+  }
+
   /*************************************************************
    * Parse the URL.
    *