From d3fbe7fa05680ecf4c8a01c0db5277ef5d3db5f8 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 21 Apr 2009 18:47:53 +0000 Subject: [PATCH] Do not free the signal index unless it was at some point allocated svn:r1217 --- ChangeLog | 3 ++- signal.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4b22eec..f9033d46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ Changes in 2.0.2-alpha: o Add a new flag to bufferevents to make all callbacks automatically deferred. o Make evdns functionality locked, and automatically defer dns callbacks. - + o Fix a possible free(NULL) when freeing an event_base with no signals. + Changes in 2.0.1-alpha: o free minheap on event_base_free(); from Christopher Layne o debug cleanups in signal.c; from Christopher Layne diff --git a/signal.c b/signal.c index 9313a8ae..15f0dd01 100644 --- a/signal.c +++ b/signal.c @@ -337,5 +337,6 @@ evsig_dealloc(struct event_base *base) base->sig.sh_old_max = 0; /* per index frees are handled in evsig_del() */ - mm_free(base->sig.sh_old); + if (base->sig.sh_old) + mm_free(base->sig.sh_old); } -- 2.50.1