diff options
| author | Björn Gustavsson <[email protected]> | 2011-08-05 10:43:05 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-05 10:43:05 +0200 |
| commit | 44a70b59a1903265a33ccefa3846e10b3f86eb5d (patch) | |
| tree | dfe2e5003b9be52ae5ae53be8770520d5a209cf1 /erts/emulator/beam/ops.tab | |
| parent | 07936436b8a8b18b80451a09e040283ebecbd43b (diff) | |
| parent | 903be1a669f9a32858e08f631fabffc00861e739 (diff) | |
| download | otp-44a70b59a1903265a33ccefa3846e10b3f86eb5d.tar.gz otp-44a70b59a1903265a33ccefa3846e10b3f86eb5d.tar.bz2 otp-44a70b59a1903265a33ccefa3846e10b3f86eb5d.zip | |
Merge branch 'bjorn/erts/loader-related-bs-bugs/OTP-9284' into dev
* bjorn/erts/loader-related-bs-bugs/OTP-9284:
Fix binary construction with huge literal sizes
beam_load.c: Add overflow check of tag values
beam_makeops: Add some sanity checks
Fix construction of <<0:((1 bsl 32)-1)>>
Diffstat (limited to 'erts/emulator/beam/ops.tab')
| -rw-r--r-- | erts/emulator/beam/ops.tab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index 8a5763b4bb..304ce22ef2 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1236,7 +1236,7 @@ i_bs_init_heap I I I d i_bs_init_heap_bin_heap I I I d -bs_init_bits Fail Sz Words Regs Flags Dst | binary_too_big_bits(Sz) => system_limit Fail +bs_init_bits Fail Sz=o Words Regs Flags Dst => system_limit Fail bs_init_bits Fail Sz=u Words=u==0 Regs Flags Dst => i_bs_init_bits Sz Regs Dst bs_init_bits Fail Sz=u Words Regs Flags Dst => i_bs_init_bits_heap Sz Words Regs Dst |