]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
avoid infinite loop in tor-resolve if tor hangs up on it
authorRoger Dingledine <arma@torproject.org>
Wed, 24 Nov 2004 07:45:42 +0000 (07:45 +0000)
committerRoger Dingledine <arma@torproject.org>
Wed, 24 Nov 2004 07:45:42 +0000 (07:45 +0000)
svn:r2977

src/tools/tor-resolve.c

index 5481ad0c42428e966d0d1c380c8814d3c653a2e7..40fd749d688fe95aafb0b767e5a6bfb5a5033efb 100644 (file)
@@ -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;