aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2004-11-10 16:10:17 +0000
committerIan Lance Taylor <ian@airs.com>2004-11-10 16:10:17 +0000
commit2b25cacb2137cd1c6f976ff8873f18d0c4d6f7cd (patch)
treeef862b4a21d6a0b7373c9a287ea3e04057197489 /binutils
parent69065f5d2f773110828d9d162e1cb1f4bffc2609 (diff)
downloadfsf-binutils-gdb-2b25cacb2137cd1c6f976ff8873f18d0c4d6f7cd.zip
fsf-binutils-gdb-2b25cacb2137cd1c6f976ff8873f18d0c4d6f7cd.tar.gz
fsf-binutils-gdb-2b25cacb2137cd1c6f976ff8873f18d0c4d6f7cd.tar.bz2
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.
Diffstat (limited to 'binutils')
-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;