From 3d7402c3fc902df9eb673c7010fa53f05f352579 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 11 Aug 2010 15:43:01 +0000 Subject: [PATCH] 2010-08-11 Brad Roberts * d-lang.c (extract_identifiers): Handle multiple digits. --- gdb/ChangeLog | 4 ++++ gdb/d-lang.c | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c47600b8ccf..aef84e75c93 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2010-08-11 Brad Roberts + + * d-lang.c (extract_identifiers): Handle multiple digits. + 2010-08-09 Jan Kratochvil * defs.h (make_cleanup_restore_uinteger, make_cleanup_restore_ui_file) diff --git a/gdb/d-lang.c b/gdb/d-lang.c index 6db521b6d81..8ef47c7cecb 100644 --- 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; -- 2.47.2