diff options
| author | Scott Lystig Fritchie <[email protected]> | 2014-03-25 18:34:11 +0900 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-25 11:37:07 +0100 |
| commit | c8b55a755da15e766a745a948f3d8020f581fd37 (patch) | |
| tree | 830cfc0b8cbfa40f4ffeb5f90b949d0d039e77b5 /erts/emulator/sys/common/erl_check_io.c | |
| parent | effb1c0a593e71664dec5b06da72518e74254c1b (diff) | |
| download | otp-c8b55a755da15e766a745a948f3d8020f581fd37.tar.gz otp-c8b55a755da15e766a745a948f3d8020f581fd37.tar.bz2 otp-c8b55a755da15e766a745a948f3d8020f581fd37.zip | |
Fix DTrace/SystemTap-related formatting
Thanks to Michał Ptaszek for bringing this embarrassing formatting error to
my attention. Many DTrace/SystemTap trace strings are incorrectly
truncated at 4/8 bytes, depending on the CPU word size. This patch expands
the work from commit d032e097 by zheng siyao.
Michał's report to the erlang-bugs list can be found at:
http://erlang.org/pipermail/erlang-bugs/2014-March/004250.html
Conflicts:
erts/emulator/beam/beam_emu.c
erts/emulator/beam/copy.c
erts/emulator/beam/dist.c
erts/emulator/beam/erl_async.c
erts/emulator/beam/erl_bif_port.c
erts/emulator/beam/erl_port_task.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/io.c
Diffstat (limited to 'erts/emulator/sys/common/erl_check_io.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index 7035dc77df..8e2f4cefa3 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -524,7 +524,8 @@ ERTS_CIO_EXPORT(driver_select)(ErlDrvPort ix, /* fast track to stop_select callback */ stop_select_fn = prt->drv_ptr->stop_select; #ifdef USE_VM_PROBES - strncpy(name, prt->drv_ptr->name, sizeof(name)-1); + strncpy(name, prt->drv_ptr->name, + sizeof(DTRACE_CHARBUF_NAME(name))-1); name[sizeof(name)-1] = '\0'; #endif ret = 0; |