From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 10 Nov 2004 16:10:17 +0000 (+0000)
Subject: 	PR binutils/536
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b25cacb2137cd1c6f976ff8873f18d0c4d6f7cd;p=binutils-gdb.git

	PR binutils/536
	* stabs.c (stab_demangle_template): Call stab_demangle_count
	rather than stab_demangle_get_count to get the length of a pointer
	target.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 832c3f6ff63..352c489d5c2 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-10  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	PR binutils/536
+	* stabs.c (stab_demangle_template): Call stab_demangle_count
+	rather than stab_demangle_get_count to get the length of a pointer
+	target.
+
 2004-11-10  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* defparse.y: Remove unnecessary commas from token list.
diff --git a/binutils/stabs.c b/binutils/stabs.c
index 52a20e848ae..42763e7642a 100644
--- a/binutils/stabs.c
+++ b/binutils/stabs.c
@@ -4321,7 +4321,8 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp,
 	    {
 	      unsigned int len;
 
-	      if (! stab_demangle_get_count (pp, &len))
+	      len = stab_demangle_count (pp);
+	      if (len == 0)
 		{
 		  stab_bad_demangle (orig);
 		  return FALSE;