Merge pull request #300 from dgrove-oss/SR-4677
SR-4677: avoid SIGSEGV if _dispatch_muxnote_create returns NULL
diff --git a/src/event/event_epoll.c b/src/event/event_epoll.c
index a3dc17c..5b8fe79 100644
--- a/src/event/event_epoll.c
+++ b/src/event/event_epoll.c
@@ -276,11 +276,13 @@
}
} else {
dmn = _dispatch_muxnote_create(du, events);
- if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_ADD) < 0) {
- _dispatch_muxnote_dispose(dmn);
- dmn = NULL;
- } else {
- TAILQ_INSERT_TAIL(dmb, dmn, dmn_list);
+ if (dmn) {
+ if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_ADD) < 0) {
+ _dispatch_muxnote_dispose(dmn);
+ dmn = NULL;
+ } else {
+ TAILQ_INSERT_TAIL(dmb, dmn, dmn_list);
+ }
}
}