commit 40fc1f3f7e5ef05653c3678b158fffef4d5b6106
author Pierre Habouzit <phabouzit@apple.com> Thu Sep 07 15:02:08 2017 -0700
committer GitHub <noreply@github.com> Thu Sep 07 15:02:08 2017 -0700
tree 0c303dd6a2173a3c5fd3ebd2dcb8c88697b86eae
parent 70ce56b7684bdc471bf7525450fb9475139534da
parent 06faaebb0bdc1788186b00e577bc43d695f6eea6

Merge pull request #300 from dgrove-oss/SR-4677

SR-4677: avoid SIGSEGV if _dispatch_muxnote_create returns NULL

src/event/event_epoll.c

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);
+			}
 		}
 	}