2010-08-11 Brad Roberts <braddr@puremagic.com>

	* d-lang.c (extract_identifiers): Handle multiple digits.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c47600b8ccff318b8145b563eac7d8e09a862a89..aef84e75c93f9fc6d80c286afaa5e8b4f1e9506f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-11  Brad Roberts  <braddr@puremagic.com>
+
+       * d-lang.c (extract_identifiers): Handle multiple digits.
+
 2010-08-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * defs.h (make_cleanup_restore_uinteger, make_cleanup_restore_ui_file)

diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 6db521b6d81ef500afe94999f8fa500fe78d1391..8ef47c7cecbf65d544b24eb12a47bae748cddf0f 100644 (file)
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -37,9 +37,11 @@ extract_identifiers (const char *mangled_str, struct obstack *tempbuf)
 
   while (isdigit (*mangled_str))
     {
-      i = strtol (mangled_str, NULL, 10);
-      mangled_str++;
-      if (i <= 0  && strlen (mangled_str) < i)
+      char *end_ptr;
+
+      i = strtol (mangled_str, &end_ptr, 10);
+      mangled_str = end_ptr;
+      if (i <= 0 || strlen (mangled_str) < i)
         return 0;
       obstack_grow (tempbuf, mangled_str, i);
       mangled_str += i;