summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-06-18 09:26:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:36 -0500
commitec49dff32649b009299978cec5899d03f0fff07b (patch)
tree781689c3c38133841eb14951842a69f0f0958dc8 /source3
parent9cee5574e9e2ed551bca400b8b674a2894090a23 (diff)
downloadsamba-ec49dff32649b009299978cec5899d03f0fff07b.tar.gz
samba-ec49dff32649b009299978cec5899d03f0fff07b.tar.bz2
samba-ec49dff32649b009299978cec5899d03f0fff07b.zip
r16338: Fix Klocwork ID 150
(This used to be commit ded2952e00fec712ce612cf6aaabf85c1a6f4488)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/client.c9
-rw-r--r--source3/client/smbctool.c9
2 files changed, 16 insertions, 2 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index d7fe4d43c3..0a695436f5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -447,7 +447,14 @@ static void adjust_do_list_queue(void)
* 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 == NULL) {
+ DEBUG(4,("do_list_queue is empty\n"));
+ do_list_queue_start = do_list_queue_end = 0;
+ return;
+ }
+
+ 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;
*do_list_queue = '\0';
diff --git a/source3/client/smbctool.c b/source3/client/smbctool.c
index b3acca5573..3233ee4955 100644
--- a/source3/client/smbctool.c
+++ b/source3/client/smbctool.c
@@ -528,7 +528,14 @@ static void adjust_do_list_queue(void)
* 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 == NULL) {
+ DEBUG(4,("do_list_queue is empty\n"));
+ do_list_queue_start = do_list_queue_end = 0;
+ return;
+ }
+
+ 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;
*do_list_queue = '\0';