diff options
| author | Sverker Eriksson <[email protected]> | 2012-02-23 14:36:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-02-23 14:37:23 +0100 |
| commit | 3398aa592af611b84edad4fa56e88379df6d1735 (patch) | |
| tree | 85def0f7ec0332102aa5bc85cd4705c81e1dc982 /erts/emulator/beam/external.c | |
| parent | 045810f873df73a09b105d051eed244be2edf7ee (diff) | |
| parent | de742bb6eb202c5a524bab3617a2ede918598705 (diff) | |
| download | otp-3398aa592af611b84edad4fa56e88379df6d1735.tar.gz otp-3398aa592af611b84edad4fa56e88379df6d1735.tar.bz2 otp-3398aa592af611b84edad4fa56e88379df6d1735.zip | |
Merge branch 'sverk/ets-compress-bug' into maint
* sverk/ets-compress-bug:
erts: Fail binary_to_term if bignum arity is too large
erts: Fix bignum-bug in ETS with compressed option
OTP-9932
Diffstat (limited to 'erts/emulator/beam/external.c')
| -rw-r--r-- | erts/emulator/beam/external.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 152dbcf085..9d52ed4e98 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -3118,6 +3118,9 @@ decoded_size(byte *ep, byte* endp, int internal_tags) case LARGE_BIG_EXT: CHKSIZE(4); n = get_int32(ep); + if (n > BIG_ARITY_MAX*sizeof(ErtsDigit)) { + return -1; + } SKIP2(n,4+1); /* skip, size,sign,digits */ heap_size += 1+1+(n+sizeof(Eterm)-1)/sizeof(Eterm); /* XXX: 1 too much? */ break; |