From cd5dbd5204a783743c72116d81e993ec041b7396 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Tue, 26 Feb 2019 10:11:59 +0100
Subject: stdlib: Correct and optimize pretty printing of strings

Avoid traversing all of the list/string when only part of it will be
used. An explicit check that the list is flat is needed since
string:slice() accepts deep lists and more.
---
 lib/stdlib/src/io_lib_pretty.erl | 46 +++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'lib/stdlib/src')

diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 5483ea87b5..8f2fd7ea8f 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -721,7 +721,7 @@ printable_list(_L, 1, _T, _Enc) ->
 printable_list(L, _D, T, latin1) when T < 0 ->
     io_lib:printable_latin1_list(L);
 printable_list(L, _D, T, Enc) when T >= 0 ->
-    case slice(L, tsub(T, 2)) of
+    case slice(L, tsub(T, 2), Enc) of
         false ->
             false;
         {prefix, Prefix} when Enc =:= latin1 ->
@@ -737,20 +737,46 @@ printable_list(L, _D, T, Enc) when T >= 0 ->
 printable_list(L, _D, T, _Uni) when T < 0->
     io_lib:printable_list(L).
 
-slice(L, N) ->
-    try io_lib:chars_length(L) =< N of
-        true ->
+slice(L, N, latin1) ->
+    try lists:split(N, L) of
+        {_, []} ->
             all;
-        false ->
-            case string:slice(L, 0, N) of
-                "" ->
-                    false;
-                Prefix ->
-                    {prefix, Prefix}
+        {[], _} ->
+            false;
+        {L1, _} ->
+            {prefix, L1}
+    catch
+        _:_ ->
+            all
+    end;
+slice(L, N, _Uni) ->
+    %% Be careful not to traverse more of L than necessary.
+    try string:slice(L, 0, N) of
+        "" ->
+            false;
+        Prefix ->
+            %% Assume no binaries are introduced by string:slice().
+            case is_flat(L, lists:flatlength(Prefix)) of
+                true ->
+                    case string:equal(Prefix, L) of
+                        true ->
+                            all;
+                        false ->
+                            {prefix, Prefix}
+                    end;
+                false ->
+                    false
             end
     catch _:_ -> false
     end.
 
+is_flat(_L, 0) ->
+    true;
+is_flat([C|Cs], N) when is_integer(C) ->
+    is_flat(Cs, N - 1);
+is_flat(_, _N) ->
+    false.
+
 printable_bin0(Bin, D, T, Enc) ->
     Len = case D >= 0 of
               true ->
-- 
cgit v1.2.3