diff options
| author | Micael Karlberg <[email protected]> | 2011-03-17 12:24:59 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-17 12:24:59 +0100 |
| commit | ffb2d69e00ef283eeb266f3082067429b6ce1127 (patch) | |
| tree | 134573a992cfcc23dad544eae9c5650f97d0e208 /erts/emulator/beam/erl_bif_info.c | |
| parent | bf6a8c53023a284b9f2de8d13538db1ab3ff8dee (diff) | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.gz otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.bz2 otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.zip | |
Merge branch 'dev' into bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 4a717d7271..e06fbde9fb 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1999-2010. All Rights Reserved. + * Copyright Ericsson AB 1999-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -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)) { |