From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 9 Jan 2018 08:46:28 +0000 (+0100)
Subject: Fix Bug#30038
X-Git-Tag: emacs-27.0.90~5912
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd21bf0c413727625f91c9aadcb40294c62c4c94;p=emacs.git

Fix Bug#30038

* lisp/net/tramp.el (tramp-make-tramp-file-name): Check, that
method is not empty.  (Bug#30038)
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1a8265200cb..72321dbdeba 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))