diff options
| author | Björn Gustavsson <[email protected]> | 2011-08-05 10:46:40 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-05 10:46:40 +0200 |
| commit | 302b2a1bf0194ca81c7731699b75e4800f718955 (patch) | |
| tree | 46b45bcefe605bdee0ee3788f9be688fc210214c /erts/emulator/beam/beam_emu.c | |
| parent | e995a244d830b688c2cb49ec0fda3653e41bb1c8 (diff) | |
| parent | 44a70b59a1903265a33ccefa3846e10b3f86eb5d (diff) | |
| download | otp-302b2a1bf0194ca81c7731699b75e4800f718955.tar.gz otp-302b2a1bf0194ca81c7731699b75e4800f718955.tar.bz2 otp-302b2a1bf0194ca81c7731699b75e4800f718955.zip | |
Merge branch 'dev' into major
* dev:
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/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index fb90a7d4f7..937b3d9e53 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3561,7 +3561,7 @@ void process_main(void) * Operands: NotUsed Live Dst */ do_bs_init_bits_known: - num_bytes = (num_bits+7) >> 3; + num_bytes = ((Uint64)num_bits+(Uint64)7) >> 3; if (num_bits & 7) { alloc += ERL_SUB_BIN_SIZE; } |