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

bk: 5316bbebu_L5-hyB4dvyZORcfX9W0Q

diff --git a/ChangeLog b/ChangeLog
index f841c7393b2250a3e40f242e594fdbe26f471e12..55131a431f6bc1e7a7e666bedb59d504cb1e68d1 100644 (file)
--- 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 0c1f4f92320674960f1873077a5f05a3425f8507..b4fbcf6659159d4f4c920dc4ed91308346a3b540 100644 (file)
--- 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);