[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-103-g514dfc6

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  514dfc632ed35a80a175a4afbe9607aa4d913da3 (commit)
      from  ab29d6c6d349352db017d3046aeaee59e33745f4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 514dfc632ed35a80a175a4afbe9607aa4d913da3
Author: Bo Yang <boyang at novell.com>
Date:   Mon Jan 12 14:15:00 2009 +0800

    Fix null pointer refrence in event context in backport from v3-3-test
    
    Signed-off-by: Bo Yang <boyang at novell.com>

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/events.c b/source/lib/events.c
index 43ca8df..fadb15e 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;
 }
 


-- 
Samba Shared Repository