Update libevent to 2.0.12

[netatalk.git] / libevent / evmap.c

diff --git a/libevent/evmap.c b/libevent/evmap.c
index 5521626cf2431137f542c94d406801fef2833328..ebedb7881437e9c4e04d198cfb155da5eea6bd62 100644 (file)
--- a/libevent/evmap.c
+++ b/libevent/evmap.c
@@ -148,6 +148,7 @@ void evmap_io_clear(struct event_io_map *ctx)
                next = HT_NEXT_RMV(event_io_map, ctx, ent);
                mm_free(this);
        }
+       HT_CLEAR(event_io_map, ctx); /* remove all storage held by the ctx. */
 }
 #endif
 
@@ -163,7 +164,6 @@ void evmap_io_clear(struct event_io_map *ctx)
 #define GET_SIGNAL_SLOT_AND_CTOR(x, map, slot, type, ctor, fdinfo_len) \
        do {                                                            \
                if ((map)->entries[slot] == NULL) {                     \
-                       EVUTIL_ASSERT(ctor != NULL);                            \
                        (map)->entries[slot] =                          \
                            mm_calloc(1,sizeof(struct type)+fdinfo_len); \
                        EVUTIL_ASSERT((map)->entries[slot] != NULL);            \