diff options
| -rw-r--r-- | libiberty/ChangeLog | 3 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 97ba223979e..a43fb90272b 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,8 @@ 2004-02-23 Ian Lance Taylor <ian@wasabisystems.com> + * cp-demangle.c (__cxa_demangle): Adjust last patch to handle + empty string correctly. + * cp-demangle.c (__cxa_demangle): It is not an error if status is not NULL. It is an error if the mangled name is the same as a built-in type name. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 4d0dd7e5b70..be7a569f0ee 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3964,8 +3964,8 @@ __cxa_demangle (mangled_name, output_buffer, length, status) internal built-in type names are a single lower case character. Frankly, this simplistic disambiguation doesn't make sense to me, but it is documented, so we implement it here. */ - if (mangled_name[1] == '\0' - && IS_LOWER (mangled_name[0]) + if (IS_LOWER (mangled_name[0]) + && mangled_name[1] == '\0' && cplus_demangle_builtin_types[mangled_name[0] - 'a'].name != NULL) { if (status != NULL) |