diff options
| author | Björn Gustavsson <[email protected]> | 2011-10-20 10:49:13 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-10-20 10:49:13 +0200 |
| commit | 6ef9aef50dbe839098e4330a97247aa21a15ecde (patch) | |
| tree | 4e556a50e08da2e9ab139ec0c82c00c7de1a4b4f /erts/emulator/beam/beam_emu.c | |
| parent | 907772538853d2f89d60702eb140e164a72503ad (diff) | |
| parent | 34db76765561487e526fe66d3d19ecf3b3fb9dc8 (diff) | |
| download | otp-6ef9aef50dbe839098e4330a97247aa21a15ecde.tar.gz otp-6ef9aef50dbe839098e4330a97247aa21a15ecde.tar.bz2 otp-6ef9aef50dbe839098e4330a97247aa21a15ecde.zip | |
Merge branch 'bjorn/unicode-noncharacters/OTP-9624'
* bjorn/unicode-noncharacters/OTP-9624:
Allow noncharacter code points in unicode encoding and decoding
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 5691f7aec1..76912ebbd6 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3967,8 +3967,7 @@ void process_main(void) * too big numbers). */ if (is_not_small(val) || val > make_small(0x10FFFFUL) || - (make_small(0xD800UL) <= val && val <= make_small(0xDFFFUL)) || - val == make_small(0xFFFEUL) || val == make_small(0xFFFFUL)) { + (make_small(0xD800UL) <= val && val <= make_small(0xDFFFUL))) { goto badarg; } Next(2); @@ -3987,8 +3986,8 @@ void process_main(void) * the valid range). */ if (is_not_small(tmp_arg1) || tmp_arg1 > make_small(0x10FFFFUL) || - (make_small(0xD800UL) <= tmp_arg1 && tmp_arg1 <= make_small(0xDFFFUL)) || - tmp_arg1 == make_small(0xFFFEUL) || tmp_arg1 == make_small(0xFFFFUL)) { + (make_small(0xD800UL) <= tmp_arg1 && + tmp_arg1 <= make_small(0xDFFFUL))) { ErlBinMatchBuffer *mb = ms_matchbuffer(tmp_arg2); mb->offset -= 32; |