From 2b25cacb2137cd1c6f976ff8873f18d0c4d6f7cd Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 10 Nov 2004 16:10:17 +0000 Subject: [PATCH] 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. --- binutils/ChangeLog | 7 +++++++ binutils/stabs.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 832c3f6ff6..352c489d5c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2004-11-10 Ian Lance Taylor + + 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 * defparse.y: Remove unnecessary commas from token list. diff --git a/binutils/stabs.c b/binutils/stabs.c index 52a20e848a..42763e7642 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;