From 4a055a655e1f82639b261689e56cbf2f1dc2d5c3 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 18 May 2018 14:49:42 +0200
Subject: Allow chars_limit to limit strings

Earlier, only reports and {Format,Args} was limited by chars_limit,
and max_size was needed to limit the size of a string.
---
 lib/kernel/src/logger_formatter.erl        |  6 +-----
 lib/kernel/test/logger_formatter_SUITE.erl | 12 ++++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/kernel/src/logger_formatter.erl b/lib/kernel/src/logger_formatter.erl
index a19e7bbc73..5882c70ddf 100644
--- a/lib/kernel/src/logger_formatter.erl
+++ b/lib/kernel/src/logger_formatter.erl
@@ -85,8 +85,6 @@ format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
 
 do_format(Level,Msg,Data,[level|Format],Config) ->
     [to_string(level,Level,Config)|do_format(Level,Msg,Data,Format,Config)];
-do_format(Level,Msg,Data,[msg|Format],Config) ->
-    [Msg|do_format(Level,Msg,Data,Format,Config)];
 do_format(Level,Msg,Data,[Key|Format],Config) when is_atom(Key); is_tuple(Key) ->
     Value = value(Key,Data),
     [to_string(Key,Value,Config)|do_format(Level,Msg,Data,Format,Config)];
@@ -130,9 +128,7 @@ to_string(X) ->
     io_lib:format("~tp",[X]).
 
 format_msg({string,Chardata},Meta,Config) ->
-    try unicode:characters_to_list(Chardata)
-    catch _:_ -> format_msg({"INVALID STRING: ~tp",[Chardata]},Meta,Config)
-    end;
+    format_msg({"~ts",[Chardata]},Meta,Config);
 format_msg({report,_}=Msg,Meta,#{report_cb:=Fun}=Config) when is_function(Fun,1) ->
     format_msg(Msg,Meta#{report_cb=>Fun},maps:remove(report_cb,Config));
 format_msg({report,Report},#{report_cb:=Fun}=Meta,Config) when is_function(Fun,1) ->
diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl
index 934fe4deef..eaa6c0aca5 100644
--- a/lib/kernel/test/logger_formatter_SUITE.erl
+++ b/lib/kernel/test/logger_formatter_SUITE.erl
@@ -269,8 +269,8 @@ format_msg(_Config) ->
     String8 = format(info,{string,['not',printable,list]},
                      #{report_cb=>fun(_)-> {"formatted",[]} end},
                      #{template=>Template}),
-    ct:log(String8),
-    "INVALID STRING: ['not',printable,list]" = String8,
+    ct:log("~ts",[String8]), % avoiding ct_log crash
+    "FORMAT ERROR: \"~ts\" - [['not',printable,list]]" = String8,
 
     String9 = format(info,{string,"string"},#{},#{template=>Template}),
     ct:log(String9),
@@ -406,6 +406,14 @@ chars_limit(_Config) ->
     L5 = MS5,
     true = lists:prefix(lists:sublist(String5,L5-4),String4),
 
+    %% Test that chars_limit limits string also
+    Str = "123456789012345678901234567890123456789012345678901234567890123456789",
+    CL6 = 80,
+    String6 = format(info,{string,Str},Meta,FC#{chars_limit=>CL6}),
+    L6 = string:length(String6),
+    ct:log("String6: ~p~nLength6: ~p~n",[String6,L6]),
+    L6 = CL6,
+
     ok.
 
 format_mfa(_Config) ->
-- 
cgit v1.2.3