From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 26 Nov 2016 01:14:12 +0000 (-0500)
Subject: Better errors checks in event.c
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60840a3a39275bd2fa7fadb1b2ff61e3dc716910;p=thirdparty%2Ffreeradius-server.git

Better errors checks in event.c
---

diff --git a/src/lib/event.c b/src/lib/event.c
index bbb3d5e7fc3..ae04079789c 100644
--- a/src/lib/event.c
+++ b/src/lib/event.c
@@ -333,7 +333,20 @@ int fr_event_timer_delete(fr_event_list_t *el, fr_event_timer_t **parent)
 
 	fr_event_timer_t *ev;
 
-	if (!el || !parent || !*parent) return -1;
+	if (!el) {
+		fr_strerror_printf("Invalid argument: NULL event list");
+		return -1;
+	}
+
+	if (!parent) {
+		fr_strerror_printf("Invalid arguments: NULL event pointer");
+		return -1;
+	}
+
+	if (!*parent) {
+		fr_strerror_printf("Invalid arguments: NULL event");
+		return -1;
+	}
 
 #ifndef NDEBUG
 	/*
@@ -352,7 +365,15 @@ int fr_event_timer_delete(fr_event_list_t *el, fr_event_timer_t **parent)
 	*parent = NULL;
 
 	ret = fr_heap_extract(el->times, ev);
-	(void)fr_cond_assert(ret == 1);	/* events MUST be in the heap */
+
+	/*
+	 *	Events MUST be in the heap
+	 */
+	if (!fr_cond_assert(ret == 1)) {
+		fr_strerror_printf("Event not found in heap");
+		talloc_free(ev);
+		return -1;
+	}
 	talloc_free(ev);
 
 	return ret;