diff options
| author | Sverker Eriksson <[email protected]> | 2014-01-22 16:24:48 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-01-22 16:24:48 +0100 |
| commit | af0227d7591bde8927ea95c93cbadee6b812b1d9 (patch) | |
| tree | 023db83bb756fa0991ecd7e7e50b40a098e31726 /erts/emulator/beam/utils.c | |
| parent | 1b904fd1fcec000efb33446859e75872dc00ef2b (diff) | |
| download | otp-af0227d7591bde8927ea95c93cbadee6b812b1d9.tar.gz otp-af0227d7591bde8927ea95c93cbadee6b812b1d9.tar.bz2 otp-af0227d7591bde8927ea95c93cbadee6b812b1d9.zip | |
erts: Fix crash when comparing very large floats with integers
big_buf was one word too short on 32-bit emulators causing
memory corruption.
Seems like this did not cause a problem before the ESTACK memory layout
was changed in 172ebf11dc455e22b87f.
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 86bb5fd3ad..e0776cf67d 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -2688,7 +2688,6 @@ tailrecur_ne: { FloatDef f1, f2; Eterm big; - Eterm big_buf[32]; #if HALFWORD_HEAP Wterm aw = is_immed(a) ? a : rterm2wterm(a,a_base); Wterm bw = is_immed(b) ? b : rterm2wterm(b,b_base); @@ -2699,6 +2698,8 @@ tailrecur_ne: #define MAX_LOSSLESS_FLOAT ((double)((1LL << 53) - 2)) #define MIN_LOSSLESS_FLOAT ((double)(((1LL << 53) - 2)*-1)) #define BIG_ARITY_FLOAT_MAX (1024 / D_EXP) /* arity of max float as a bignum */ + Eterm big_buf[BIG_NEED_SIZE(BIG_ARITY_FLOAT_MAX)]; + b_tag = tag_val_def(bw); switch(_NUMBER_CODE(a_tag, b_tag)) { @@ -2761,7 +2762,7 @@ tailrecur_ne: j = float_comp(f1.fd, f2.fd); } } else { - big = double_to_big(f2.fd, big_buf); + big = double_to_big(f2.fd, big_buf, sizeof(big_buf)/sizeof(Eterm)); j = big_comp(aw, rterm2wterm(big,big_buf)); } if (_NUMBER_CODE(a_tag, b_tag) == FLOAT_BIG) { |