[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3349-gd50a487
Jeremy Allison
jra at samba.org
Mon Jan 12 07:45:59 GMT 2009
The branch, v3-2-test has been updated
via d50a487b11c4c256c674327344a824e97eeb620e (commit)
from e0b70923298a0f33d92b9a2901098328d914ab1e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d50a487b11c4c256c674327344a824e97eeb620e
Author: Bo Yang <boyang at novell.com>
Date: Mon Jan 12 15:41:02 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 27dd052..229e7e2 100644
--- a/source/lib/events.c
+++ b/source/lib/events.c
@@ -63,7 +63,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;
}
@@ -133,7 +135,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
More information about the samba-cvs
mailing list