From e013e10d0e96917b627d54f20e3dba80a17df0d5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Nov 2019 20:07:31 +0100 Subject: [PATCH] ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled --- src/shared/ask-password-api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 5488d8a74b7..04ef6b58932 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -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) -- 2.39.2