From: Jo-Philipp Wich <redacted>
Date: Tue, 11 Dec 2018 08:17:42 +0000 (+0100)
Subject: luci-lib-httpclient: prevent nil access with invalid IP address literals
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a692ca789ae916b1393a39236ff8cf3e8a431717;p=openwrt-luci.git

luci-lib-httpclient: prevent nil access with invalid IP address literals

Fixes: a54baf7be ("luci-lib-httpclient: revamp URL handling")
Signed-off-by: Jo-Philipp Wich <redacted>
---

diff --git a/libs/luci-lib-httpclient/luasrc/httpclient.lua b/libs/luci-lib-httpclient/luasrc/httpclient.lua
index f19fa44387..79ce41294c 100644
--- a/libs/luci-lib-httpclient/luasrc/httpclient.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient.lua
@@ -108,20 +108,20 @@ function parse_url(uri)
 	url.host, tmp = rest:match("^%[([0-9a-fA-F:]+)%](.*)$")
 	if url.host and tmp then
 		url.ip6addr = ip.IPv6(url.host)
-		url.host = string.format("[%s]", url.ip6addr:string())
-		rest = tmp
 		if not url.ip6addr then
 			return nil
 		end
+		url.host = string.format("[%s]", url.ip6addr:string())
+		rest = tmp
 	else
 		url.host, tmp = rest:match("^(%d+%.%d+%.%d+%.%d+)(.*)$")
 		if url.host and tmp then
 			url.ipaddr = ip.IPv4(url.host)
-			url.host = url.ipaddr:string()
-			rest = tmp
 			if not url.ipaddr then
 				return nil
 			end
+			url.host = url.ipaddr:string()
+			rest = tmp
 		else
 			url.host, tmp = rest:match("^([0-9a-zA-Z%.%-]+)(.*)$")
 			if url.host and tmp then