From 5290bea7a33bf718205a8d3535c01ce4e51cfe83 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sun, 24 Aug 2014 11:54:47 +0200
Subject: Properly handle broken input in standard_error

io:put_chars(standard_error, [oops]) could previously crash the
standard_error process.

Reported-by: Alexei Sholik
---
 lib/kernel/src/standard_error.erl | 89 ++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 33 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/src/standard_error.erl b/lib/kernel/src/standard_error.erl
index fe28fe3ab5..1c43063937 100644
--- a/lib/kernel/src/standard_error.erl
+++ b/lib/kernel/src/standard_error.erl
@@ -95,17 +95,47 @@ do_io_request(Req, From, ReplyAs, Port) ->
     io_reply(From, ReplyAs, Reply).
 
 %% New in R13B
-% Wide characters (Unicode)
-io_request({put_chars,Encoding,Chars}, Port) -> % Binary new in R9C
-    put_chars(wrap_characters_to_binary(Chars, Encoding, get(encoding)), Port);
-io_request({put_chars,Encoding,Mod,Func,Args}, Port) ->
-    Result = case catch apply(Mod,Func,Args) of
-		 Data when is_list(Data); is_binary(Data) ->
-		     wrap_characters_to_binary(Data, Encoding, get(encoding));
-		 Undef ->
-		     Undef
-	     end,
-    put_chars(Result, Port);
+%% Encoding option (unicode/latin1)
+io_request({put_chars,unicode,Chars}, Port) ->
+    case wrap_characters_to_binary(Chars, unicode, get(encoding)) of
+        error ->
+            {error,{error,put_chars}};
+        Bin ->
+            put_chars(Bin, Port)
+    end;
+io_request({put_chars,unicode,Mod,Func,Args}, Port) ->
+    case catch apply(Mod, Func, Args) of
+        Data when is_list(Data); is_binary(Data) ->
+            case wrap_characters_to_binary(Data, unicode, get(encoding)) of
+                Bin when is_binary(Bin) ->
+                    put_chars(Bin, Port);
+                error ->
+                    {error,{error,put_chars}}
+            end;
+        _ ->
+            {error,{error,put_chars}}
+    end;
+io_request({put_chars,latin1,Chars}, Port) ->
+    case catch unicode:characters_to_binary(Chars, latin1, get(encoding)) of
+        Data when is_binary(Data) ->
+            put_chars(Data, Port);
+        _ ->
+            {error,{error,put_chars}}
+    end;
+io_request({put_chars,latin1,Mod,Func,Args}, Port) ->
+    case catch apply(Mod, Func, Args) of
+        Data when is_list(Data); is_binary(Data) ->
+            case
+                catch unicode:characters_to_binary(Data, latin1, get(encoding))
+            of
+                Bin when is_binary(Bin) ->
+                    put_chars(Bin, Port);
+                _ ->
+                    {error,{error,put_chars}}
+            end;
+        _ ->
+            {error,{error,put_chars}}
+    end;
 %% BC if called from pre-R13 node
 io_request({put_chars,Chars}, Port) -> 
     io_request({put_chars,latin1,Chars}, Port); 
@@ -168,14 +198,7 @@ io_reply(From, ReplyAs, Reply) ->
 %% put_chars
 put_chars(Chars, Port) when is_binary(Chars) ->
     _ = put_port(Chars, Port),
-    {ok,ok};
-put_chars(Chars, Port) ->
-    case catch list_to_binary(Chars) of
-	Binary when is_binary(Binary) ->
-	    put_chars(Binary, Port);
-	_ ->
-	    {error,{error,put_chars}}
-    end.
+    {ok,ok}.
 
 %% setopts
 setopts(Opts0) ->
@@ -227,17 +250,17 @@ wrap_characters_to_binary(Chars,From,To) ->
 		_Else ->
 		    16#10ffff
 	    end,
-    unicode:characters_to_binary(
-      [ case X of
-	    $\n ->
-		if
-		    TrNl ->
-			"\r\n";
-		    true ->
-			$\n
-		end;
-	    High when High > Limit ->
-		["\\x{",erlang:integer_to_list(X, 16),$}];
-	    Ordinary ->
-		Ordinary
-	end || X <- unicode:characters_to_list(Chars,From) ],unicode,To).
+    case catch unicode:characters_to_list(Chars, From) of
+        L when is_list(L) ->
+            unicode:characters_to_binary(
+              [ case X of
+                    $\n when TrNl ->
+                        "\r\n";
+                    High when High > Limit ->
+                        ["\\x{",erlang:integer_to_list(X, 16),$}];
+                    Low ->
+                        Low
+                end || X <- L ], unicode, To);
+        _ ->
+            error
+    end.
-- 
cgit v1.2.3