From d68b279981496c5293746524e00ff77fd8a8b84c Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 17 Jun 2016 14:49:04 +0200
Subject: ssh: Fix a hazard bug in ssh_auth

---
 lib/ssh/src/ssh_io.erl | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl
index 6be5ea25bb..5e335c2063 100644
--- a/lib/ssh/src/ssh_io.erl
+++ b/lib/ssh/src/ssh_io.erl
@@ -31,7 +31,7 @@ read_line(Prompt, Ssh) ->
     format("~s", [listify(Prompt)]),
     proplists:get_value(user_pid, Ssh) ! {self(), question},
     receive
-	Answer ->
+	Answer when is_list(Answer) ->
 	    Answer
     end.
 
@@ -44,7 +44,7 @@ yes_no(Prompt, Ssh) ->
 	y -> yes;
 	n -> no;
 
-	Answer ->
+	Answer when is_list(Answer) ->
 	    case trim(Answer) of
 		"y" -> yes;
 		"n" -> no;
@@ -62,20 +62,24 @@ read_password(Prompt, Opts) when is_list(Opts) ->
     format("~s", [listify(Prompt)]),
     proplists:get_value(user_pid, Opts) ! {self(), user_password},
     receive
-	"" ->
-	    read_password(Prompt, Opts);
-	Answer ->
-	    Answer
+	Answer when is_list(Answer) ->
+	     case trim(Answer) of
+		 "" ->
+		     read_password(Prompt, Opts);
+		 Pwd ->
+		     Pwd
+	     end
     end.
 
 
+format(Fmt, Args) ->
+    io:format(Fmt, Args).
+
+%%%================================================================
 listify(A) when is_atom(A)   -> atom_to_list(A);
 listify(L) when is_list(L)   -> L;
 listify(B) when is_binary(B) -> binary_to_list(B).
 
-format(Fmt, Args) ->
-    io:format(Fmt, Args).
-
 
 trim(Line) when is_list(Line) ->
     lists:reverse(trim1(lists:reverse(trim1(Line))));
-- 
cgit v1.2.3