From: Robert Pluim Date: Tue, 1 Sep 2020 14:59:50 +0000 (+0200) Subject: Strip carriage returns from received password prompts (comint) X-Git-Tag: emacs-28.0.90~6285 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e3ec402938be0d61c19831c12e69a10672dd681;p=emacs.git Strip carriage returns from received password prompts (comint) * comint.el (comint-password-prompt-regexp): Strip carriage returns from the received prompt before matching. (Bug#43003) --- diff --git a/lisp/comint.el b/lisp/comint.el index be0e32b9e09..b4ea232767c 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2423,11 +2423,13 @@ Security bug: your string can still be temporarily recovered with (defun comint-watch-for-password-prompt (string) "Prompt in the minibuffer for password and send without echoing. Looks for a match to `comint-password-prompt-regexp' in order -to detect the need to (prompt and) send a password. +to detect the need to (prompt and) send a password. Ignores any +carriage returns (\\r) in STRING. This function could be in the list `comint-output-filter-functions'." (when (let ((case-fold-search t)) - (string-match comint-password-prompt-regexp string)) + (string-match comint-password-prompt-regexp + (replace-regexp-in-string "\r" "" string))) (when (string-match "^[ \n\r\t\v\f\b\a]+" string) (setq string (replace-match "" t t string))) (let ((comint--prompt-recursion-depth (1+ comint--prompt-recursion-depth)))