From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 26 Mar 2010 18:20:10 +0000 (-0400)
Subject: Fix a free(NULL) in minheap-internal.h
X-Git-Tag: release-2.0.5-beta~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f20492fa27f08524af25914c02bc72d357b4197;p=libevent

Fix a free(NULL) in minheap-internal.h
---

diff --git a/minheap-internal.h b/minheap-internal.h
index 8253dfe7..4739daf4 100644
--- a/minheap-internal.h
+++ b/minheap-internal.h
@@ -62,7 +62,7 @@ int min_heap_elem_greater(struct event *a, struct event *b)
 }
 
 void min_heap_ctor(min_heap_t* s) { s->p = 0; s->n = 0; s->a = 0; }
-void min_heap_dtor(min_heap_t* s) { mm_free(s->p); }
+void min_heap_dtor(min_heap_t* s) { if (s->p) mm_free(s->p); }
 void min_heap_elem_init(struct event* e) { e->ev_timeout_pos.min_heap_idx = -1; }
 int min_heap_empty(min_heap_t* s) { return 0u == s->n; }
 unsigned min_heap_size(min_heap_t* s) { return s->n; }