From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Sep 2012 15:19:08 +0000 (+0200)
Subject: fireinfo: Fix parsing invalid IP addresses.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e04cf1412a7428b3da189bfa30db4f2bebe3010c;p=ipfire.org.git

fireinfo: Fix parsing invalid IP addresses.
---

diff --git a/fireinfo/fireinfod b/fireinfo/fireinfod
index f51173c7..da7ca44f 100755
--- a/fireinfo/fireinfod
+++ b/fireinfo/fireinfod
@@ -304,7 +304,14 @@ class ProfileSendHandler(BaseHandler):
 		# Get GeoIP information if address is not defined in rfc1918
 		remote_ips = self.request.remote_ip.split(", ")
 		for remote_ip in remote_ips:
-			addr = ipaddr.IPAddress(remote_ip)
+			try:
+				addr = ipaddr.IPAddress(remote_ip)
+			except ValueError:
+				# Skip invalid IP addresses.
+				continue
+
+			# Check if the given IP address is from a
+			# private network.
 			if addr.is_private:
 				continue