From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Jul 2004 21:05:05 +0000 (+0000)
Subject: Handle closed connection properly on tor_resolve
X-Git-Tag: tor-0.0.8pre1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d53717215bb6c47b277a46060fb52e92d297a45;p=thirdparty%2Ftor.git

Handle closed connection properly on tor_resolve


svn:r2066
---

diff --git a/contrib/tor_resolve b/contrib/tor_resolve
index 8242916df4..31b44af9d4 100755
--- a/contrib/tor_resolve
+++ b/contrib/tor_resolve
@@ -97,7 +97,11 @@ def resolve(hostname, sockshost, socksport, socksver=4):
     answer = s.recv(8)
     result = parse(answer)
     while result is None:
-        answer += s.recv(1)
+        more = s.recv(1)
+        if not more:
+            print "Connection closed; dying."
+            return None
+        answer += more
         result = parse(answer)
     print "Got answer",result
     m = s.recv(1)