ask-password-api: do not call ask_password_keyring() if keyname == NULL
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 30 Dec 2018 12:13:43 +0000 (21:13 +0900)
committerMichael Biebl <biebl@debian.org>
Sat, 12 Jan 2019 20:49:44 +0000 (20:49 +0000)
Fixes #11295.

(cherry picked from commit 1f00998c8739ac6adc2b7623cc1e5a8f67d95d7d)
(cherry picked from commit 095a38313daf043413c863634378c8ea7e5f6a09)

Gbp-Pq: Name ask-password-api-do-not-call-ask_password_keyring-if-keyn.patch

src/shared/ask-password-api.c

index 246e27a13579457b6ed82ac12b521e5961f6b84e..6a51c2e20e06efd35f30e5d79e532b4f3a0cf843 100644 (file)
@@ -341,7 +341,7 @@ int ask_password_tty(
                         goto finish;
                 }
 
-                if (notify >= 0 && pollfd[POLL_INOTIFY].revents != 0) {
+                if (notify >= 0 && pollfd[POLL_INOTIFY].revents != 0 && keyname) {
                         (void) flush_fd(notify);
 
                         r = ask_password_keyring(keyname, flags, ret);