From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Aug 2013 23:06:58 +0000 (-0400)
Subject: Add some assertions to please coverity.
X-Git-Tag: release-2.1.4-alpha~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b065d07df196;p=libevent

Add some assertions to please coverity.

In event_process_active_single_queue, EVLIST_INIT must be set on any
event that uses one of the event-only closures, and so "ev" will be
set in those cases.  But coverity's worried here (CIDs numerous).  So
instead, just add the assertions that should make it happy.
---

diff --git a/event.c b/event.c
index e406bd66..d3ebb14c 100644
--- a/event.c
+++ b/event.c
@@ -1519,12 +1519,15 @@ event_process_active_single_queue(struct event_base *base,
 
 		switch (evcb->evcb_closure) {
 		case EV_CLOSURE_EVENT_SIGNAL:
+			EVUTIL_ASSERT(ev != NULL);
 			event_signal_closure(base, ev);
 			break;
 		case EV_CLOSURE_EVENT_PERSIST:
+			EVUTIL_ASSERT(ev != NULL);
 			event_persist_closure(base, ev);
 			break;
 		case EV_CLOSURE_EVENT:
+			EVUTIL_ASSERT(ev != NULL);
 			EVBASE_RELEASE_LOCK(base, th_base_lock);
 			(*ev->ev_callback)(
 				ev->ev_fd, ev->ev_res, ev->ev_arg);