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

bk: 531be9f3DjhjtK-4JqoNHKTgVVuoDg

diff --git a/ChangeLog b/ChangeLog
index 8397db9475bb645cdd79b8604464bc7a71b123b8..85c98d550694a5df2f85406dbe9c1f6e6ca9c3af 100644 (file)
--- 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 b4fbcf6659159d4f4c920dc4ed91308346a3b540..01f0e14226c9e28e49a6f9ca3d13df03dc7f10e1 100644 (file)
--- 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);
                }