From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 16 Jul 2012 05:26:42 +0000 (-0600)
Subject: Bug 3556 Workaround: epoll assertion failed: comm.cc:1093: isOpen(fd)
X-Git-Tag: sourceformat-review-1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7e637d7f79ce2ebd56e8f3ae8e9c2c72557efe4;p=thirdparty%2Fsquid.git

Bug 3556 Workaround: epoll assertion failed: comm.cc:1093: isOpen(fd)
---

diff --git a/src/comm.cc b/src/comm.cc
index e39f66b1a8..878b1bb545 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1090,7 +1090,11 @@ _comm_close(int fd, char const *file, int line)
         return;
 
     /* The following fails because ipc.c is doing calls to pipe() to create sockets! */
-    assert(isOpen(fd));
+    if (!isOpen(fd)) {
+        debugs(50, DBG_IMPORTANT, HERE << "BUG 3556: FD " << fd << " is not an open socket.");
+        // XXX: do we need to run close(fd) or fd_close(fd) here?
+        return;
+    }
 
     assert(F->type != FD_FILE);