aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Clementi <luca.clementi@gmail.com>2014-01-07 00:00:59 -0800
committerPetr Machata <pmachata@redhat.com>2014-01-07 11:46:05 +0100
commit5d3be3319b6997961283e5da61318bf46ac650a3 (patch)
tree155f1677a6710516350cc51a2b218802e5842979
parentf19471597b3044764919319b364cdd04187fd696 (diff)
downloadltrace-5d3be3319b6997961283e5da61318bf46ac650a3.tar.gz
Fix infinite loop in stack unwind
This bug was introduced in af452c6 Reported-by: Petr Machata <pmachata@redhat.com>
-rw-r--r--output.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/output.c b/output.c
index f804cd0..c961576 100644
--- a/output.c
+++ b/output.c
@@ -662,9 +662,12 @@ output_right(enum tof type, struct process *proc, struct library_symbol *libsym,
unw_init_remote(&cursor, proc->unwind_as, proc->unwind_priv);
while (unwind_depth) {
- if (unw_get_reg(&cursor, UNW_REG_IP, (unw_word_t *) &ip)) {
- fprintf(options.output, " > stacktrace_error\n");
- continue;
+ own_retval = unw_get_reg(&cursor, UNW_REG_IP,
+ (unw_word_t *) &ip);
+ if (own_retval) {
+ fprintf(options.output, " > Error: %s\n",
+ unw_strerror(own_retval));
+ goto cont;
}
/* We are looking for the library with the base address
@@ -694,6 +697,7 @@ output_right(enum tof type, struct process *proc, struct library_symbol *libsym,
fprintf(options.output, " > %s(??\?) [%p]\n",
lib_name, ip);
+ cont:
if (unw_step(&cursor) <= 0)
break;
unwind_depth--;