From: Haomai Wang <haomaiwang@gmail.com>
Date: Mon, 20 Apr 2015 02:41:50 +0000 (+0800)
Subject: Event: Fix memory leak for notify fd
X-Git-Tag: v9.0.1~74^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69bedcd692fd505f63d58a016585de7edbc396ad;p=ceph.git

Event: Fix memory leak for notify fd

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc
index a2fb88cd6965..cf60a0060757 100644
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@ -99,12 +99,14 @@ EventCenter::~EventCenter()
 {
   delete driver;
 
-  if (file_events)
-    free(file_events);
-  if (notify_receive_fd > 0)
+  if (notify_receive_fd >= 0) {
+    delete_file_event(notify_receive_fd, EVENT_READABLE);
     ::close(notify_receive_fd);
-  if (notify_send_fd > 0)
+  }
+  if (notify_send_fd >= 0)
     ::close(notify_send_fd);
+  if (file_events)
+    free(file_events);
 }
 
 int EventCenter::create_file_event(int fd, int mask, EventCallbackRef ctxt)