git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7004045
)
Fix null pointer refrence in event context in backport from v3-3-test
author
Bo Yang
<boyang@novell.com>
Mon, 12 Jan 2009 06:15:00 +0000
(14:15 +0800)
committer
Karolin Seeger
<kseeger@samba.org>
Mon, 12 Jan 2009 09:13:46 +0000
(10:13 +0100)
Signed-off-by: Bo Yang <boyang@novell.com>
(cherry picked from commit
514dfc632ed35a80a175a4afbe9607aa4d913da3
)
source/lib/events.c
patch
|
blob
|
history
diff --git
a/source/lib/events.c
b/source/lib/events.c
index 43ca8df6209f337b55615439063f86bfe57fa4a6..fadb15e2d56cfd58e2ff00f4368ab15a69df6a3a 100644
(file)
--- 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;
}