aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-05-29 13:24:46 +0200
committerErlang/OTP <[email protected]>2019-05-29 13:24:46 +0200
commit797aca26c3bbf9004f8539433fc1a1a5c27db9fb (patch)
tree65ca7518f67a324927b6b5bde2e7dd345624d4e8 /lib/stdlib/src
parenteecaa6a63e57e0df8c8faae6c0ffe8752b15a39f (diff)
parent8bdcb96c3c33afd7f85fc2953970b6709f04a74a (diff)
downloadotp-797aca26c3bbf9004f8539433fc1a1a5c27db9fb.tar.gz
otp-797aca26c3bbf9004f8539433fc1a1a5c27db9fb.tar.bz2
otp-797aca26c3bbf9004f8539433fc1a1a5c27db9fb.zip
Merge branch 'hasse/stdlib/chars_limit_bug/OTP-15847/ERL-957' into maint-22
* hasse/stdlib/chars_limit_bug/OTP-15847/ERL-957: stdlib: Fix a bug concerning io_lib option 'chars_limit' # Conflicts: # lib/stdlib/test/io_SUITE.erl
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/io_lib_pretty.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index b1a5991bf0..0cb3b01aae 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -780,6 +780,8 @@ printable_bin0(Bin, D, T, Enc) ->
end,
printable_bin(Bin, Len, D, Enc).
+printable_bin(_Bin, 0, _D, _Enc) ->
+ false;
printable_bin(Bin, Len, D, latin1) ->
N = erlang:min(20, Len),
L = binary_to_list(Bin, 1, N),