aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-30 16:53:52 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-30 16:53:52 -0700
commit2dec6007d183aa51abedbbb048382973129f3935 (patch)
tree774535810d618d76979a2852cc3bf59917dd7453
parent78c4ef475d47a2289635f74b726f52defedb4651 (diff)
downloadglibc-2dec6007d183aa51abedbbb048382973129f3935.zip
glibc-2dec6007d183aa51abedbbb048382973129f3935.tar.gz
glibc-2dec6007d183aa51abedbbb048382973129f3935.tar.bz2
Stop backtrace when we make no more progress.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/ia64/backtrace.c10
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d0120c..9e78199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/ia64/backtrace.c (backtrace_helper): Stop backtrace when
+ we make no more progress.
+
2009-07-29 Ulrich Drepper <drepper@redhat.com>
* math/s_fma.c: Don't define alias if __fma is a macro.
diff --git a/sysdeps/ia64/backtrace.c b/sysdeps/ia64/backtrace.c
index 423fed8..5cefb86 100644
--- a/sysdeps/ia64/backtrace.c
+++ b/sysdeps/ia64/backtrace.c
@@ -1,5 +1,5 @@
/* Return backtrace of current program state.
- Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
@@ -61,7 +61,13 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
/* We are first called with address in the __backtrace function.
Skip it. */
if (arg->cnt != -1)
- arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+ {
+ arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+
+ /* Check whether we make any progress. */
+ if (arg->cnt > 0 && arg->array[arg->cnt - 1] == arg->array[arg->cnt])
+ return _URC_END_OF_STACK;
+ }
if (++arg->cnt == arg->size)
return _URC_END_OF_STACK;
return _URC_NO_REASON;