]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
ask-password: don't hit assert() when we query pw which the user C-d and caching...
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Nov 2019 19:07:31 +0000 (20:07 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 14 Nov 2019 09:04:11 +0000 (10:04 +0100)
src/shared/ask-password-api.c

index 5488d8a74b70ea2350fa1447b0e232088f76025a..04ef6b58932816607102698f508a9b8385f4023a 100644 (file)
@@ -105,10 +105,11 @@ static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **pa
         int r;
 
         assert(keyname);
-        assert(passwords);
 
         if (!(flags & ASK_PASSWORD_PUSH_CACHE))
                 return 0;
+        if (strv_isempty(passwords))
+                return 0;
 
         r = lookup_key(keyname, &serial);
         if (r >= 0) {
@@ -147,7 +148,6 @@ static int add_to_keyring_and_log(const char *keyname, AskPasswordFlags flags, c
         int r;
 
         assert(keyname);
-        assert(passwords);
 
         r = add_to_keyring(keyname, flags, passwords);
         if (r < 0)