From 4deeca97e4030b586629aea02e5cd26159d91b88 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 Dec 2007 14:43:31 -0800 Subject: More null deref fixes. Jeremy. (This used to be commit efaebdb141a841ec083f20f8905ae0294b81d0d6) --- source3/client/client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/client') diff --git a/source3/client/client.c b/source3/client/client.c index 18758c0216..bbe5572a2d 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -4343,7 +4343,7 @@ static int process(const char *base_directory) return 1; } - if (*base_directory) { + if (base_directory && *base_directory) { rc = do_cd(base_directory); if (rc) { cli_cm_shutdown(); @@ -4412,7 +4412,7 @@ static int do_tar_op(const char *base_directory) recurse=true; - if (*base_directory) { + if (base_directory && *base_directory) { ret = do_cd(base_directory); if (ret) { cli_cm_shutdown(); @@ -4711,7 +4711,7 @@ static int do_message_op(void) load_interfaces(); - if (service_opt) { + if (service_opt && service) { size_t len; /* Convert any '/' characters in the service name to '\' characters */ @@ -4764,7 +4764,7 @@ static int do_message_op(void) return do_tar_op(base_directory); } - if (query_host) { + if (query_host && *query_host) { char *qhost = query_host; char *slash; -- cgit