diff options
author | John Högberg <[email protected]> | 2018-07-04 09:49:14 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-07-04 09:49:14 +0200 |
commit | e746e48b165ee82761f76eabf954950102ddcd11 (patch) | |
tree | 45781ffab7c31b1e3d9422c63467a7d2b519e99c /lib/stdlib/src | |
parent | acda1cd97b575feea532886231300aa38e65fb8c (diff) | |
parent | e4529b82e0f2980a8b3f4b961dc18ff1fdd43d8e (diff) | |
download | otp-e746e48b165ee82761f76eabf954950102ddcd11.tar.gz otp-e746e48b165ee82761f76eabf954950102ddcd11.tar.bz2 otp-e746e48b165ee82761f76eabf954950102ddcd11.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
Eliminate a crash in the beam_jump pass
stdlib: Fix a 'chars_limit' bug
Fix a race condition when generating async operation ids
Fix internal compiler error for map_get/2
beam_type: Fix unsafe optimization
public_key: Remove moduli 5121 and 7167 Thoose were added by 598629aeba9de98e8cdf5637043eb34e5d407751 but are not universaly supported.
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r-- | lib/stdlib/src/io_lib_pretty.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl index dca1b37ef3..ba9d9e8434 100644 --- a/lib/stdlib/src/io_lib_pretty.erl +++ b/lib/stdlib/src/io_lib_pretty.erl @@ -722,7 +722,7 @@ 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 - {prefix, ""} -> + false -> false; {prefix, Prefix} when Enc =:= latin1 -> io_lib:printable_latin1_list(Prefix) andalso {true, Prefix}; @@ -738,11 +738,17 @@ printable_list(L, _D, T, _Uni) when T < 0-> io_lib:printable_list(L). slice(L, N) -> - case string:length(L) =< N of + try string:length(L) =< N of true -> all; false -> - {prefix, string:slice(L, 0, N)} + case string:slice(L, 0, N) of + "" -> + false; + Prefix -> + {prefix, Prefix} + end + catch _:_ -> false end. printable_bin0(Bin, D, T, Enc) -> |