aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog7
-rw-r--r--binutils/stabs.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 832c3f6..352c489 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 52a20e8..42763e7 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;