diff options
| author | Rickard Green <[email protected]> | 2016-12-19 14:29:33 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-12-19 14:29:33 +0100 |
| commit | c2e497d888456e7720bd3d4123694c444ef9072b (patch) | |
| tree | bcfb96d6df06f25f7d9e97094e719a7f85354e69 /erts/etc | |
| parent | 1715b9284643150da0f3ea43df42df1a4a90e144 (diff) | |
| parent | 7d475a83abee8a79f8be564e2772dd434780e15f (diff) | |
| download | otp-c2e497d888456e7720bd3d4123694c444ef9072b.tar.gz otp-c2e497d888456e7720bd3d4123694c444ef9072b.tar.bz2 otp-c2e497d888456e7720bd3d4123694c444ef9072b.zip | |
Merge branch 'rickard/stacktrace-bugs' into maint
OTP-14055
* rickard/stacktrace-bugs:
Remove faulty release note for these fixes
New test cases testing stacktrace from apply on erlang:error()
Fix stactrace for apply on error/[1,2], exit/1, or throw/1
Fix stack-trace generated by a traced process
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/unix/etp-commands.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in index fa68bd26ee..f2babc48d2 100644 --- a/erts/etc/unix/etp-commands.in +++ b/erts/etc/unix/etp-commands.in @@ -1322,7 +1322,11 @@ define etp-stacktrace set $etp_stacktrace_p = ($arg0)->stop set $etp_stacktrace_end = ($arg0)->hend printf "%% Stacktrace (%u): ", $etp_stacktrace_end-$etp_stacktrace_p - etp ($arg0)->cp + if ($arg0)->cp == 0x0 + printf "NULL\n" + else + etp ($arg0)->cp + end while $etp_stacktrace_p < $etp_stacktrace_end if ($etp_stacktrace_p[0] & 0x3) == 0x0 # Continuation pointer @@ -1350,7 +1354,11 @@ define etp-stackdump set $etp_stackdump_p = ($arg0)->stop set $etp_stackdump_end = ($arg0)->hend printf "%% Stackdump (%u): ", $etp_stackdump_end-$etp_stackdump_p - etp ($arg0)->cp + if ($arg0)->cp == 0x0 + printf "NULL\n" + else + etp ($arg0)->cp + end while $etp_stackdump_p < $etp_stackdump_end etp $etp_stackdump_p[0] set $etp_stackdump_p++ |