From: Roger Dingledine <arma@torproject.org>
Date: Wed, 24 Nov 2004 07:45:42 +0000 (+0000)
Subject: avoid infinite loop in tor-resolve if tor hangs up on it
X-Git-Tag: debian-version-0.0.8+0.0.9rc2-1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c89afb791705aa86828b9d407fa744ed9312a0ac;p=thirdparty%2Ftor.git

avoid infinite loop in tor-resolve if tor hangs up on it


svn:r2977
---

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 5481ad0c42..40fd749d68 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -137,6 +137,10 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport,
   len = 0;
   while (len < RESPONSE_LEN) {
     r = recv(s, response_buf+len, RESPONSE_LEN-len, 0);
+    if (r==0) {
+      log_fn(LOG_WARN,"EOF while reading SOCKS response");
+      return -1;
+    }
     if (r<0) {
       log_sock_error("reading SOCKS response", s);
       return -1;