From: Nick Clifton <nickc@redhat.com>
Date: Fri, 30 Mar 2012 12:51:07 +0000 (+0000)
Subject: 	PR binutils/13925
X-Git-Tag: sid-snapshot-20120401~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b149968f7a256b7413da56c6cebb78497f4e5654;p=thirdparty%2Fbinutils-gdb.git

	PR binutils/13925
	* stabs.c (stab_demangle_v3_arglist): Cope with the demangler
	returning an empty context for a function with no arguments.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d229810f5ea..749378f6437 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 9534d6616ac..04c345252db 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)