From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Wed, 8 Oct 2008 05:47:39 +0000 (+0000)
Subject: fix crash reported by Bernard Li - connection_thread_main: avoid double calls to... 
X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=commitdiff_plain;h=6d9b8ecd5a3e2f9ce9df0f46d0818bc36a93ec5c

fix crash reported by Bernard Li - connection_thread_main: avoid double calls to close_connection -- kevin


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1590 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 9c8847d..36d418b 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -1844,23 +1844,18 @@ static void *connection_thread_main (void *args) /* {{{ */
     else if (status < 0) /* error */
     {
       status = errno;
-      if (status == EINTR)
-        continue;
-      RRDD_LOG (LOG_ERR, "connection_thread_main: poll(2) failed.");
+      if (status != EINTR)
+        RRDD_LOG (LOG_ERR, "connection_thread_main: poll(2) failed.");
       continue;
     }
 
     if ((pollfd.revents & POLLHUP) != 0) /* normal shutdown */
-    {
-      close_connection(sock);
       break;
-    }
     else if ((pollfd.revents & (POLLIN | POLLPRI)) == 0)
     {
       RRDD_LOG (LOG_WARNING, "connection_thread_main: "
           "poll(2) returned something unexpected: %#04hx",
           pollfd.revents);
-      close_connection(sock);
       break;
     }