diff options
| author | Björn Gustavsson <[email protected]> | 2011-03-11 11:23:39 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-03-11 11:23:39 +0100 |
| commit | 1f07334d042e478d385caa0d7634ebfa6703f27a (patch) | |
| tree | 7ee4b8039614e702487c85e945f4b524309e761f /erts/emulator/beam/erl_bif_info.c | |
| parent | 095158307f04dab2c38cc73ab9d1de0c1686ea01 (diff) | |
| parent | 1aa1166460dc22791ab909bb0a8565b2e12a1820 (diff) | |
| download | otp-1f07334d042e478d385caa0d7634ebfa6703f27a.tar.gz otp-1f07334d042e478d385caa0d7634ebfa6703f27a.tar.bz2 otp-1f07334d042e478d385caa0d7634ebfa6703f27a.zip | |
Merge branch 'bjorn/binary-overflow/OTP-9117' into dev
* bjorn/binary-overflow/OTP-9117:
Fix 18 exabyte memory allocation failure
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 4a717d7271..a7b5920425 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -1545,7 +1545,7 @@ process_info_aux(Process *BIF_P, case am_backtrace: { erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(0); erts_stack_dump(ERTS_PRINT_DSBUF, (void *) dsbufp, rp); - res = new_binary(BIF_P, (byte *) dsbufp->str, (int) dsbufp->str_len); + res = new_binary(BIF_P, (byte *) dsbufp->str, dsbufp->str_len); erts_destroy_tmp_dsbuf(dsbufp); hp = HAlloc(BIF_P, 3); break; @@ -2074,7 +2074,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN); ASSERT(dsbufp && dsbufp->str); - res = new_binary(BIF_P, (byte *) dsbufp->str, (int) dsbufp->str_len); + res = new_binary(BIF_P, (byte *) dsbufp->str, dsbufp->str_len); erts_destroy_info_dsbuf(dsbufp); BIF_RET(res); } else if (ERTS_IS_ATOM_STR("dist_ctrl", BIF_ARG_1)) { |