9222fc4
From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001
9222fc4
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
9222fc4
Date: Mon, 6 Mar 2017 10:04:22 +0100
9222fc4
Subject: [PATCH] Fix CRLF injection in Wget host part
9222fc4
9222fc4
* src/url.c (url_parse): Reject control characters in host part of URL
9222fc4
9222fc4
Reported-by: Orange Tsai
9222fc4
---
9222fc4
 src/url.c | 11 +++++++++++
9222fc4
 1 file changed, 11 insertions(+)
9222fc4
9222fc4
diff --git a/src/url.c b/src/url.c
9222fc4
index 8f8ff0b..7d36b27 100644
9222fc4
--- a/src/url.c
9222fc4
+++ b/src/url.c
9222fc4
@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
9222fc4
       url_unescape (u->host);
9222fc4
       host_modified = true;
9222fc4
 
9222fc4
+      /* check for invalid control characters in host name */
9222fc4
+      for (p = u->host; *p; p++)
9222fc4
+        {
9222fc4
+          if (c_iscntrl(*p))
9222fc4
+            {
9222fc4
+              url_free(u);
9222fc4
+              error_code = PE_INVALID_HOST_NAME;
9222fc4
+              goto error;
9222fc4
+            }
9222fc4
+        }
9222fc4
+
9222fc4
       /* Apply IDNA regardless of iri->utf8_encode status */
9222fc4
       if (opt.enable_iri && iri)
9222fc4
         {
9222fc4
-- 
9222fc4
2.7.4
9222fc4