From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 9 Mar 2014 04:11:31 +0000 (-0500)
Subject: CID 711660: Do a non-NULL pointer assertion check a bit earlier
X-Git-Tag: NTP_4_2_7P432~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c236666f86aa2e1a9abc8fc791d65f8260552d9d;p=thirdparty%2Fntp.git

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

bk: 531be9f3DjhjtK-4JqoNHKTgVVuoDg
---

diff --git a/ChangeLog b/ChangeLog
index 8397db947..85c98d550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
+* CID 711660: Do a non-NULL pointer assertion check a bit earlier.
 (4.2.7p431) 2014/03/05 Released by Harlan Stenn <stenn@ntp.org>
-* CID 711669: Do a non-NULL pointer assertion check a bit earlier.
 * [Bug 2572] cross-compiling fails for --with-yielding-select.
 (4.2.7p430) 2014/03/04 Released by Harlan Stenn <stenn@ntp.org>
 * Upgrade to libevent-2.1.3-alpha-dev.
diff --git a/sntp/libevent/event.c b/sntp/libevent/event.c
index b4fbcf665..01f0e1422 100644
--- a/sntp/libevent/event.c
+++ b/sntp/libevent/event.c
@@ -1569,8 +1569,8 @@ event_process_active_single_queue(struct event_base *base,
 			event_persist_closure(base, ev);
 			break;
 		case EV_CLOSURE_EVENT: {
-			void (*evcb_callback)(evutil_socket_t, short, void *) = *ev->ev_callback;
 			EVUTIL_ASSERT(ev != NULL);
+			void (*evcb_callback)(evutil_socket_t, short, void *) = *ev->ev_callback;
 			EVBASE_RELEASE_LOCK(base, th_base_lock);
 			evcb_callback(ev->ev_fd, ev->ev_res, ev->ev_arg);
 		}