emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master fd21bf0: Fix Bug#30038


From: Michael Albinus
Subject: [Emacs-diffs] master fd21bf0: Fix Bug#30038
Date: Tue, 9 Jan 2018 03:46:39 -0500 (EST)

branch: master
commit fd21bf0c413727625f91c9aadcb40294c62c4c94
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Fix Bug#30038
    
    * lisp/net/tramp.el (tramp-make-tramp-file-name): Check, that
    method is not empty.  (Bug#30038)
---
 lisp/net/tramp.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1a82652..72321db 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1423,9 +1423,10 @@ the form (METHOD USER DOMAIN HOST PORT LOCALNAME 
&optional HOP)."
              localname (nth 5 args)
              hop (nth 6 args))))
 
+    (when (zerop (length method))
+      (signal 'wrong-type-argument (list 'stringp method)))
     (concat tramp-prefix-format hop
-           (unless (or (zerop (length method))
-                       (zerop (length tramp-postfix-method-format)))
+           (unless (zerop (length tramp-postfix-method-format))
              (concat method tramp-postfix-method-format))
            user
            (unless (zerop (length domain))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]