aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/common
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-03-25 11:47:11 +0100
committerLukas Larsson <[email protected]>2014-03-25 11:47:11 +0100
commit62430f5399c31b1be0a4737cff680b8d4122f41e (patch)
tree2a185b79f8ae1880f778bc6832b624f3c2a61ea1 /erts/emulator/sys/common
parentc5dc6babf962b22aaffd04bd8c1fff761973f0c0 (diff)
parentc8b55a755da15e766a745a948f3d8020f581fd37 (diff)
downloadotp-62430f5399c31b1be0a4737cff680b8d4122f41e.tar.gz
otp-62430f5399c31b1be0a4737cff680b8d4122f41e.tar.bz2
otp-62430f5399c31b1be0a4737cff680b8d4122f41e.zip
Merge branch 'paulgray/dtrace_snprintf_fix/OTP-11816'
* paulgray/dtrace_snprintf_fix/OTP-11816: Fix DTrace/SystemTap-related formatting
Diffstat (limited to 'erts/emulator/sys/common')
-rw-r--r--erts/emulator/sys/common/erl_check_io.c3
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 245841a768..1db673e7f3 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -527,7 +527,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;