[qpid-proton] branch master updated: PROTON-2211: fix fd leak on connections in new epoll proactor implementation

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cliffjansen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e1fff5  PROTON-2211: fix fd leak on connections in new epoll proactor implementation
9e1fff5 is described below

commit 9e1fff5f7998fcb171c958c10a84d72b4df7eb93
Author: Cliff Jansen <cl...@apache.org>
AuthorDate: Thu May 7 07:33:16 2020 -0700

    PROTON-2211: fix fd leak on connections in new epoll proactor implementation
---
 c/src/proactor/epoll.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index 6667365..6ae9660 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -953,7 +953,11 @@ static void pconnection_cleanup(pconnection_t *pc) {
   stop_polling(&pc->psocket.epoll_io, pc->psocket.proactor->epollfd);
   if (fd != -1)
     pclosefd(pc->psocket.proactor, fd);
+
+  fd = pc->timer.epoll_io.fd;
   stop_polling(&pc->timer.epoll_io, pc->psocket.proactor->epollfd);
+  if (fd != -1)
+    pclosefd(pc->psocket.proactor, fd);
   ptimer_finalize(&pc->timer);
 
   lock(&pc->context.mutex);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org