From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#36834: 27.0.50; [PATCH] password-cache.el: confuses key absence with nil password Date: Sat, 10 Aug 2019 13:01:18 +0300 Message-ID: <83lfw18hld.fsf@gnu.org> References: <875znltof0.fsf@telefonica.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="49003"; mail-complaints-to="usenet@blaine.gmane.org" Cc: ofv@wanadoo.es, 36834@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 10 12:02:10 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hwOCP-000CeR-S6 for geb-bug-gnu-emacs@m.gmane.org; Sat, 10 Aug 2019 12:02:09 +0200 Original-Received: from localhost ([::1]:35624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwOCO-0003rY-QC for geb-bug-gnu-emacs@m.gmane.org; Sat, 10 Aug 2019 06:02:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38873) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwOCJ-0003rE-LS for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2019 06:02:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwOCI-0006wx-MQ for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2019 06:02:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34659) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hwOCI-0006ws-I1 for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2019 06:02:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hwOCI-0007Xy-Ec for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2019 06:02:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Aug 2019 10:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36834 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 36834-submit@debbugs.gnu.org id=B36834.156543129828982 (code B ref 36834); Sat, 10 Aug 2019 10:02:02 +0000 Original-Received: (at 36834) by debbugs.gnu.org; 10 Aug 2019 10:01:38 +0000 Original-Received: from localhost ([127.0.0.1]:43480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hwOBs-0007XL-Sg for submit@debbugs.gnu.org; Sat, 10 Aug 2019 06:01:37 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hwOBr-0007XA-Fv for 36834@debbugs.gnu.org; Sat, 10 Aug 2019 06:01:35 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:51637) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hwOBk-0006fz-3Q; Sat, 10 Aug 2019 06:01:29 -0400 Original-Received: from [176.228.60.248] (port=2134 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hwOBg-0000xx-El; Sat, 10 Aug 2019 06:01:25 -0400 In-reply-to: (message from Stefan Monnier on Sat, 10 Aug 2019 05:14:22 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:164836 Archived-At: > From: Stefan Monnier > Date: Sat, 10 Aug 2019 05:14:22 -0400 > Cc: 36834@debbugs.gnu.org > > > So I propose this patch: > > > > diff --git a/lisp/password-cache.el b/lisp/password-cache.el > > index 5a09ae4859..6009fb491e 100644 > > --- a/lisp/password-cache.el > > +++ b/lisp/password-cache.el > > @@ -81,7 +81,8 @@ password-in-cache-p > > "Check if KEY is in the cache." > > (and password-cache > > key > > - (gethash key password-data))) > > + (not (eq (gethash key password-data 'password-cache-no-data) > > + 'password-cache-no-data)))) > > > > (defun password-read (prompt &optional key) > > "Read password, for use with KEY, from user, or from cache if wanted. > > @@ -125,7 +126,9 @@ password-cache-remove > > (defun password-cache-add (key password) > > "Add password to cache. > > The password is removed by a timer after `password-cache-expiry' seconds." > > - (when (and password-cache-expiry (null (gethash key password-data))) > > + (when (and password-cache-expiry > > + (eq (gethash key password-data 'password-cache-no-data) > > + 'password-cache-no-data)) > > (run-at-time password-cache-expiry nil > > #'password-cache-remove > > key)) > > Looks good to me, thanks. Thanks. Óscar, please push to the emacs-26 branch, and thanks.