From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 2 Apr 2014 01:10:14 +0000 (-0400)
Subject: Add one more missing heck on bug4645 fixes
X-Git-Tag: tor-0.2.5.4-alpha~82^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=408bd98e79196933e447cbc68c73ecffebaf5a19;p=thirdparty%2Ftor.git

Add one more missing heck on bug4645 fixes
---

diff --git a/src/or/directory.c b/src/or/directory.c
index 6effe45db4..d6d2339e9b 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1415,9 +1415,8 @@ http_set_address_origin(const char *headers, connection_t *conn)
     fwd = http_get_header(headers, "X-Forwarded-For: ");
   if (fwd) {
     tor_addr_t toraddr;
-    tor_addr_parse(&toraddr,fwd);
-
-    if (tor_addr_is_internal(&toraddr,0)) {
+    if (tor_addr_parse(&toraddr,fwd) == -1 ||
+        tor_addr_is_internal(&toraddr,0)) {
       log_debug(LD_DIR, "Ignoring local/internal IP %s", escaped(fwd));
       tor_free(fwd);
       return;