From: John Shahid <jvshahid@gmail.com>
Date: Wed, 15 May 2019 14:29:58 +0000 (+0200)
Subject: Avoid infinitly looping in tramp-interrupt-process (bug#35506)
X-Git-Tag: emacs-27.0.90~2884
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0ebc389ebba0ca5b99e019c47c4a616941378ac;p=emacs.git

Avoid infinitly looping in tramp-interrupt-process (bug#35506)

* lisp/net/tramp.el (tramp-interrupt-process): Remove with-timeout.
Instead pass a timeout to tramp-accept-process-output.
tramp-accept-process-output stops timers from running which makes the
with-timeout ineffective.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0a3129fd454..2aa62eba80e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4861,10 +4861,9 @@ Only works for Bourne-like shells."
 	 (format "kill -2 -%d" pid))
 	;; Wait, until the process has disappeared.  If it doesn't,
 	;; fall back to the default implementation.
-	(with-timeout (1 (ignore))
-	  (while (tramp-accept-process-output proc))
-	  ;; Report success.
-	  proc)))))
+        (and (tramp-accept-process-output proc 1)
+	     ;; Report success.
+	     proc)))))
 
 ;; `interrupt-process-functions' exists since Emacs 26.1.
 (when (boundp 'interrupt-process-functions)