diff options
| author | Björn Gustavsson <bjorn@erlang.org> | 2023-04-24 07:57:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2023-04-24 09:01:52 +0200 |
| commit | 5a1fbccf0128042aa1ae04b6ce7da08da992daf9 (patch) | |
| tree | b528a6df64676c177db1876660a7a936591ccb12 | |
| parent | 0863bd30aabd035c83158c78046c5ffda16127e1 (diff) | |
| download | erlang-5a1fbccf0128042aa1ae04b6ce7da08da992daf9.tar.gz | |
Eliminate crash in matching of utf32 segment
| -rw-r--r-- | erts/emulator/beam/emu/ops.tab | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/jit/x86/ops.tab | 4 | ||||
| -rw-r--r-- | erts/emulator/test/bs_utf_SUITE.erl | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/erts/emulator/beam/emu/ops.tab b/erts/emulator/beam/emu/ops.tab index 28cee5cd36..d1469f05d6 100644 --- a/erts/emulator/beam/emu/ops.tab +++ b/erts/emulator/beam/emu/ops.tab @@ -1208,6 +1208,10 @@ bs_skip_utf16 Fail=f Ms=xy Unit=u Flags=u => bs_get_utf16 Fail Ms Unit Flags x i_bs_get_utf16 xy f? t d +bs_get_utf32 Fail=f Ms=xy Live=u Flags=u Ms=d => \ + bs_get_integer2 Fail Ms Live i=32 u=1 Flags x | \ + i_bs_validate_unicode_retract Fail x Ms | \ + move x Ms bs_get_utf32 Fail=f Ms=xy Live=u Flags=u Dst=d => \ bs_get_integer2 Fail Ms Live i=32 u=1 Flags Dst | \ i_bs_validate_unicode_retract Fail Dst Ms diff --git a/erts/emulator/beam/jit/x86/ops.tab b/erts/emulator/beam/jit/x86/ops.tab index d917d6b87b..66c1c96089 100644 --- a/erts/emulator/beam/jit/x86/ops.tab +++ b/erts/emulator/beam/jit/x86/ops.tab @@ -892,6 +892,10 @@ bs_skip_utf16 Fail=f Ms=xy u Flags=u => skip_utf16(Fail, Ms, Flags) i_bs_get_utf16 S f? t d i_bs_skip_utf16 S f? t +bs_get_utf32 Fail=f Ms=xy Live=u Flags=u Ms=d => \ + bs_get_integer2 Fail Ms Live i=32 u=1 Flags x | \ + i_bs_validate_unicode_retract Fail x Ms | \ + move x Ms bs_get_utf32 Fail=f Ms=xy Live=u Flags=u Dst=d => \ bs_get_integer2 Fail Ms Live i=32 u=1 Flags Dst | \ i_bs_validate_unicode_retract Fail Dst Ms diff --git a/erts/emulator/test/bs_utf_SUITE.erl b/erts/emulator/test/bs_utf_SUITE.erl index a344f5c456..8885b31324 100644 --- a/erts/emulator/test/bs_utf_SUITE.erl +++ b/erts/emulator/test/bs_utf_SUITE.erl @@ -272,6 +272,10 @@ utf32_illegal_sequences(Config) when is_list(Config) -> utf32_fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large. utf32_fail_range(16#D800, 16#DFFF), %Reserved for UTF-16. utf32_fail_range(-100, -1), + + <<>> = id(<< 0 || <<X/utf32>> <= <<"àxxx">>, _ = X >>), + <<>> = id(<< 0 || <<X/little-utf32>> <= <<"àxxx">>, _ = X >>), + ok. utf32_fail_range(Char, End) when Char =< End -> |