summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-04-08 02:49:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:00:50 -0500
commita7ddbbb3f8ebc57ac64f696abf1dd856e9875ad6 (patch)
tree179ddf46b4d488c1c6e0cc887c33e20f61a7c4eb /source4
parent02a224d3bf777ef5b82b6c4f69231e6430d283bc (diff)
downloadsamba-a7ddbbb3f8ebc57ac64f696abf1dd856e9875ad6.tar.gz
samba-a7ddbbb3f8ebc57ac64f696abf1dd856e9875ad6.tar.bz2
samba-a7ddbbb3f8ebc57ac64f696abf1dd856e9875ad6.zip
r14979: avoid a null ptr deref
(This used to be commit b197bee4f6b0a310215620d18b081fca00661803)
Diffstat (limited to 'source4')
-rw-r--r--source4/client/client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index ceb949ffd9..b016632fbd 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -408,11 +408,13 @@ static void init_do_list_queue(void)
static void adjust_do_list_queue(void)
{
+ if (do_list_queue == NULL) return;
+
/*
* If the starting point of the queue is more than half way through,
* move everything toward the beginning.
*/
- if (do_list_queue && (do_list_queue_start == do_list_queue_end))
+ if (do_list_queue_start == do_list_queue_end)
{
DEBUG(4,("do_list_queue is empty\n"));
do_list_queue_start = do_list_queue_end = 0;