]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
utils/smbtree: do not crash with no password (-N)
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 5 Feb 2025 03:47:39 +0000 (16:47 +1300)
committerDouglas Bagnall <dbagnall@samba.org>
Tue, 26 Aug 2025 22:42:39 +0000 (22:42 +0000)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15170

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
source3/utils/smbtree.c

index 26363fd58ed97d1ae3bd6915f8de9fa32cc63385..4e178113e1ae57b0b8dd32a04d220a1ad67c2925 100644 (file)
@@ -47,6 +47,7 @@ static void get_auth_data_with_context_fn(
 {
        struct cli_credentials *creds = samba_cmdline_get_creds();
        size_t len;
+       const char *pwd = NULL;
 
        len = strlcpy(domain, cli_credentials_get_domain(creds), domain_len);
        if ((int)len >= domain_len) {
@@ -57,8 +58,12 @@ static void get_auth_data_with_context_fn(
        if ((int)len >= user_len) {
                return;
        }
-       len = strlcpy(
-               password, cli_credentials_get_password(creds), password_len);
+       pwd = cli_credentials_get_password(creds);
+       if (pwd == NULL) {
+               pwd = "";
+       }
+
+       len = strlcpy(password, pwd, password_len);
        if ((int)len >= password_len) {
                /* pointless, but what can you do... */
                return;