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 832c3f6ff63d4517bf27e16e1eb776868d213151..352c489d5c2d1b0a3d4d53ca7c51d9f2ea7b6b3d 100644 (file)
--- 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 52a20e848ae9154453beb1e30e689bc2d418ce4e..42763e7642ac4315ab4f894978ac07dd5726f3ca 100644 (file)
--- 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;