From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 5 Mar 2014 05:53:47 +0000 (-0500)
Subject: CID 711669: Do a non-NULL pointer assertion check a bit earlier
X-Git-Tag: NTP_4_2_7P431~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dedef450a8b4682b7d038168979aa7dab094c40;p=thirdparty%2Fntp.git

CID 711669: Do a non-NULL pointer assertion check a bit earlier

bk: 5316bbebu_L5-hyB4dvyZORcfX9W0Q
---

diff --git a/ChangeLog b/ChangeLog
index f841c7393..55131a431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* CID 711669: Do a non-NULL pointer assertion check a bit earlier.
 (4.2.7p430) 2014/03/04 Released by Harlan Stenn <stenn@ntp.org>
 * Upgrade to libevent-2.1.3-alpha-dev.
 * [Bug 2572] cross-compiling fails for --with-yielding-select.
diff --git a/sntp/libevent/event.c b/sntp/libevent/event.c
index 0c1f4f923..b4fbcf665 100644
--- a/sntp/libevent/event.c
+++ b/sntp/libevent/event.c
@@ -1583,9 +1583,9 @@ event_process_active_single_queue(struct event_base *base,
 		break;
 		case EV_CLOSURE_EVENT_FINALIZE:
 		case EV_CLOSURE_EVENT_FINALIZE_FREE: {
+			EVUTIL_ASSERT(ev != NULL);
 			void (*evcb_evfinalize)(struct event *, void *) = ev->ev_evcallback.evcb_cb_union.evcb_evfinalize;
 			base->current_event = NULL;
-			EVUTIL_ASSERT(ev != NULL);
 			EVUTIL_ASSERT((evcb->evcb_flags & EVLIST_FINALIZING));
 			EVBASE_RELEASE_LOCK(base, th_base_lock);
 			evcb_evfinalize(ev, ev->ev_arg);