From: Bo Yang <boyang@novell.com>
Date: Mon, 12 Jan 2009 06:15:00 +0000 (+0800)
Subject: Fix null pointer refrence in event context in backport from v3-3-test
X-Git-Tag: samba-3.0.34~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a909a43586fff63f50e04a0a384c844ef7e28794;p=thirdparty%2Fsamba.git

Fix null pointer refrence in event context in backport from v3-3-test

Signed-off-by: Bo Yang <boyang@novell.com>
(cherry picked from commit 514dfc632ed35a80a175a4afbe9607aa4d913da3)
---

diff --git a/source/lib/events.c b/source/lib/events.c
index 43ca8df6209..fadb15e2d56 100644
--- a/source/lib/events.c
+++ b/source/lib/events.c
@@ -64,7 +64,9 @@ static int timed_event_destructor(struct timed_event *te)
 {
 	DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te,
 		te->event_name));
-	DLIST_REMOVE(te->event_ctx->timed_events, te);
+	if (te->event_ctx) {
+		DLIST_REMOVE(te->event_ctx->timed_events, te);
+	}
 	return 0;
 }
 
@@ -134,7 +136,9 @@ static int fd_event_destructor(struct fd_event *fde)
 {
 	struct event_context *event_ctx = fde->event_ctx;
 
-	DLIST_REMOVE(event_ctx->fd_events, fde);
+	if (event_ctx) {
+		DLIST_REMOVE(event_ctx->fd_events, fde);
+	}
 	return 0;
 }