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

MadCoder · web-flow · commit 40fc1f3f7e5e · 2017-09-07T15:02:08.000-07:00
SR-4677: avoid SIGSEGV if _dispatch_muxnote_create returns NULL
diff --git a/src/event/event_epoll.c b/src/event/event_epoll.c
@@ -276,11 +276,13 @@ _dispatch_unote_register(dispatch_unote_t du,
 		}
 	} 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);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -276,11 +276,13 @@ _dispatch_unote_register(dispatch_unote_t du,`
`276`	`276`	`}`
`277`	`277`	`} else {`
`278`	`278`	`dmn = _dispatch_muxnote_create(du, events);`
`279`		`- if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_ADD) < 0) {`
`280`		`- _dispatch_muxnote_dispose(dmn);`
`281`		`- dmn = NULL;`
`282`		`- } else {`
`283`		`- TAILQ_INSERT_TAIL(dmb, dmn, dmn_list);`
	`279`	`+ if (dmn) {`
	`280`	`+ if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_ADD) < 0) {`
	`281`	`+ _dispatch_muxnote_dispose(dmn);`
	`282`	`+ dmn = NULL;`
	`283`	`+ } else {`
	`284`	`+ TAILQ_INSERT_TAIL(dmb, dmn, dmn_list);`
	`285`	`+ }`
`284`	`286`	`}`
`285`	`287`	`}`
`286`	`288`