r14126: resolve two warnings from the coverity scan
authorSteve French <sfrench@samba.org>
Fri, 10 Mar 2006 03:47:57 +0000 (03:47 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:11:13 +0000 (11:11 -0500)
(This used to be commit 32c7243b80f1f06d37511fb87f7a5c715f4847c6)

source3/client/mount.cifs.c

index 7801e7b2221d61b286c91cd0038bc63f6599913a..103e369f27e6d5e0664d45953180f8f3aec8047e 100755 (executable)
@@ -863,7 +863,7 @@ int main(int argc, char ** argv)
        char * share_name = NULL;
        char * ipaddr = NULL;
        char * uuid = NULL;
-       char * mountpoint;
+       char * mountpoint = NULL;
        char * options;
        char * resolved_path;
        char * temp;
@@ -897,9 +897,10 @@ int main(int argc, char ** argv)
 /* #ifdef _GNU_SOURCE
        printf(" node: %s machine: %s sysname %s domain %s\n", sysinfo.nodename,sysinfo.machine,sysinfo.sysname,sysinfo.domainname);
 #endif */
-
-       share_name = argv[1];
-       mountpoint = argv[2];
+       if(argc > 2) {
+               share_name = argv[1];
+               mountpoint = argv[2];
+       }
 
        /* add sharename in opts string as unc= parm */
 
@@ -1028,8 +1029,10 @@ int main(int argc, char ** argv)
                }
        }
 
-       if(argc < 3)
+       if((argc < 3) || (share_name == NULL) || (mountpoint == NULL)) {
                mount_cifs_usage();
+               exit(1);
+       }
 
        if (getenv("PASSWD")) {
                if(mountpassword == NULL)