aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/stabs.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d229810..749378f 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-30 Nick Clifton <nickc@redhat.com>
+
+ PR binutils/13925
+ * stabs.c (stab_demangle_v3_arglist): Cope with the demangler
+ returning an empty context for a function with no arguments.
+
2012-03-28 Tom Tromey <tromey@redhat.com>
* dwarf.c (display_gdb_index): Handle index version 6.
diff --git a/binutils/stabs.c b/binutils/stabs.c
index 9534d66..04c3452 100644
--- a/binutils/stabs.c
+++ b/binutils/stabs.c
@@ -5169,6 +5169,11 @@ stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info,
return NULL;
}
+ /* PR 13925: Cope if the demangler returns an empty
+ context for a function with no arguments. */
+ if (dc->u.s_binary.left == NULL)
+ break;
+
arg = stab_demangle_v3_arg (dhandle, info, dc->u.s_binary.left,
NULL, &varargs);
if (arg == NULL)