diff options
author | Sverker Eriksson <sverker@erlang.org> | 2022-11-17 17:34:56 +0100 |
---|---|---|
committer | Sverker Eriksson <sverker@erlang.org> | 2022-11-17 17:34:56 +0100 |
commit | 0aac592b8a14509dbaed54d3da764dec9e5a2373 (patch) | |
tree | a3b706cb5535d02e0085fcc50b5c7d86e58bce24 /erts/emulator/beam/external.c | |
parent | 1f4d7439c18db8c660afc84d7a06dc29024493a2 (diff) | |
parent | a482c7cab61c37c4e818bf3c918df4d5f8dc1804 (diff) | |
download | erlang-0aac592b8a14509dbaed54d3da764dec9e5a2373.tar.gz |
Merge branch 'fix-binary_to_term-integer-overflow-2' into maint
OTP-18328
Diffstat (limited to 'erts/emulator/beam/external.c')
-rw-r--r-- | erts/emulator/beam/external.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index f6ee236445..374dec2a90 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -4170,37 +4170,39 @@ dec_term_atom_common: *objp = NIL; break; case LIST_EXT: - n = get_int32(ep); + { + Uint32 nu = get_uint32(ep); ep += 4; - if (n == 0) { + if (nu == 0) { next = objp; break; } *objp = make_list(hp); - hp += 2 * n; + hp += 2 * (Uint) nu; objp = hp - 2; objp[0] = (Eterm) (objp+1); objp[1] = (Eterm) next; next = objp; objp -= 2; - n--; + nu--; if (ctx) { - if (reds < n) { + if ((Uint) reds < nu) { ASSERT(reds > 0); ctx->state = B2TDecodeList; - ctx->u.dc.remaining_n = n - reds; - n = reds; + ctx->u.dc.remaining_n = nu - reds; + nu = reds; } - reds -= n; + reds -= nu; } - while (n > 0) { + while (nu > 0) { objp[0] = (Eterm) next; objp[1] = make_list(next); next = objp; objp -= 2; - n--; + nu--; } break; + } case STRING_EXT: n = get_int16(ep); ep += 2; |