Fix the bug about invalid event fd

Change-Id: Ib2304c66e9db0fa0557b1dfed375409622880691

diff --git a/packaging/capi-network-vine.spec b/packaging/capi-network-vine.spec
index 6f7a6f3126b82c06556053bfb63e9946c8128710..9f939da25a8665aec94d54a3ffd94688bf3fb25f 100755 (executable)
--- a/packaging/capi-network-vine.spec
+++ b/packaging/capi-network-vine.spec
@@ -3,7 +3,7 @@
 %bcond_without use_glib_event_loop
 Name:    capi-network-vine
 Summary: An service discovery framework
-Version: 1.2.10
+Version: 1.2.11
 Release: 0
 Group:   Network & Connectivity/API
 License: Apache-2.0

diff --git a/src/vine-event-loop-epoll.cpp b/src/vine-event-loop-epoll.cpp
index 5ab153db2f8f55f16a7c0629d9971741a2365922..91705175ed8343e88221ee7c4816c9fd26b3033e 100755 (executable)
--- a/src/vine-event-loop-epoll.cpp
+++ b/src/vine-event-loop-epoll.cpp
@@ -81,13 +81,17 @@ static void *__vine_event_loop_epoll_run(void *arg)
                }
 
                for (int i = 0; i < n; ++i) {
-                       if (_find_io_event_handler(events[i].data.fd) == NULL) {
-                               VINE_LOGI("Removed fd[%d]", events[i].data.fd);
+                       vine_epoll_io_event_handler *h = (vine_epoll_io_event_handler *)events[i].data.ptr;
+
+                       if (!h)
+                               continue;
+
+                       if (_find_io_event_handler(h->fd) == NULL) {
+                               VINE_LOGI("Removed fd[%d]", h->fd);
                                continue;
                        }
 
-                       vine_epoll_io_event_handler *h = (vine_epoll_io_event_handler *)events[i].data.ptr;
-                       if (h && h->fd > 0 && h->handler)
+                       if (h->handler)
                                h->handler(h->fd, events[i].events, h->user_data);
                }
        } while (!__cleanup);