diff options
| author | DJ Delorie <dj@redhat.com> | 2002-03-30 06:17:57 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-03-30 06:17:57 +0000 |
| commit | f2160d2bd1df14c041da3cb0415d5a04d4509745 (patch) | |
| tree | 3f58b2ea2038aad650ea1514f4b31c88f7f4dc31 | |
| parent | 03c7bc89c0a654961942db0fcbb17742ff789bdc (diff) | |
| download | binutils-f2160d2bd1df14c041da3cb0415d5a04d4509745.tar.gz binutils-f2160d2bd1df14c041da3cb0415d5a04d4509745.tar.bz2 binutils-f2160d2bd1df14c041da3cb0415d5a04d4509745.zip | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 28f39927ada..feb0379bc17 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2002-03-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz> + + * cp-demangle.c (java_demangle_v3): Don't try to release "demangled" + if it is NULL. + 2002-03-27 DJ Delorie <dj@redhat.com> * hex.c: Add documentation. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 28d36413582..a130fd8374c 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3846,7 +3846,11 @@ java_demangle_v3 (mangled) free (cplus_demangled); - return_value = dyn_string_release (demangled); + if (demangled) + return_value = dyn_string_release (demangled); + else + return_value = NULL; + return return_value; } |