aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-07-14 15:46:35 +0200
committerLukas Larsson <[email protected]>2016-07-14 15:46:35 +0200
commit4cec737d18f02a3cb3e59b95b86c0a50a0649693 (patch)
tree1dc3d883becf5be241cb8351b9b68f5ba012b3e9 /erts/emulator
parent1dbfc5fdc7dfecd69bb7e8a86fbadc844c5ffa58 (diff)
parent8e1e877265b312c95978e9b70e8c383fb18f7508 (diff)
downloadotp-4cec737d18f02a3cb3e59b95b86c0a50a0649693.tar.gz
otp-4cec737d18f02a3cb3e59b95b86c0a50a0649693.tar.bz2
otp-4cec737d18f02a3cb3e59b95b86c0a50a0649693.zip
Merge branch 'lukas/erts/tracing/get_seq_tracer_mem_leak/OTP-13742' into maint
* lukas/erts/tracing/get_seq_tracer_mem_leak/OTP-13742: erts: Make sure to de-allocate the old seq tracer
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_trace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 4cf38bf894..d14d237ca6 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -493,8 +493,8 @@ erts_get_system_seq_tracer(void)
if (st != erts_tracer_nil &&
call_enabled_tracer(st, NULL, TRACE_FUN_ENABLED,
am_trace_status, am_undefined) == am_remove) {
- erts_set_system_seq_tracer(NULL, 0, erts_tracer_nil);
- st = erts_tracer_nil;
+ st = erts_set_system_seq_tracer(NULL, 0, erts_tracer_nil);
+ ERTS_TRACER_CLEAR(&st);
}
return st;