]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2012 17:06:40 +0000 (12:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2012 17:06:40 +0000 (12:06 -0500)
1  2 
event.c

diff --cc event.c
index 8963e22e2d0510b0c31dd7cc766b76ec40c7dc94,a979f1f2649695678a1b152368baa6f5b14b35e4..fc3ceef54fd668bdfe4a6a2a155261462297bf5c
+++ b/event.c
@@@ -2020,8 -1850,13 +2020,13 @@@ event_pending(const struct event *ev, s
  {
        int flags = 0;
  
+       if (EVUTIL_FAILURE_CHECK(ev->ev_base == NULL)) {
+               event_warnx("%s: event has no event_base set.", __func__);
+               return 0;
+       }
        EVBASE_ACQUIRE_LOCK(ev->ev_base, th_base_lock);
 -      _event_debug_assert_is_setup(ev);
 +      event_debug_assert_is_setup_(ev);
  
        if (ev->ev_flags & EVLIST_INSERTED)
                flags |= (ev->ev_events & (EV_READ|EV_WRITE|EV_SIGNAL));