allow min_heap_erase to be called on removed members; from liusifan

svn:r849

diff --git a/ChangeLog b/ChangeLog
index 1878f8eaad746d42bc9e9157f6e680ee47df0837..c33b1e7487810df39f4dd0fec7a6d96118b0d1f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,7 @@ Changes in current version:
  o support for selecting event backends by their features, and for querying the features of a backend.
  o change failing behavior of event_base_new_with_config: if a config is provided and no backend is selected, return NULL instead of aborting.
  o deliver partial data to request callbacks when chunked callback is set even if there is no chunking on the http level; allows cancelation of requests from within the chunked callback; from Scott Lamb.
+ o allow min_heap_erase to be called on removed members; from liusifan.
 
 Changes in 1.4.0:
  o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

diff --git a/min_heap.h b/min_heap.h
index ac0ea674452560c1cea9c16859129934eee1c56f..ad0043f1be5c9f499ddceee22cd5c901c6328ffa 100644 (file)
--- a/min_heap.h
+++ b/min_heap.h
@@ -75,8 +75,8 @@ struct event* min_heap_pop(min_heap_t* s)
     if(s->n)
     {
         struct event* e = *s->p;
-        e->min_heap_idx = -1;
         min_heap_shift_down_(s, 0u, s->p[--s->n]);
+        e->min_heap_idx = -1;
         return e;
     }
     return 0;