diff options
| author | DJ Delorie <dj@delorie.com> | 2011-03-25 16:38:27 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2011-03-25 16:38:27 +0000 |
| commit | f099e2bc28a1ba73914754d2b42a0db827281cd9 (patch) | |
| tree | 2c056baf93edb53a71f66cbf03e98b9be6c2480e /libiberty | |
| parent | c2fe3773e409806a7de7148c15f07a0178a4f1d1 (diff) | |
| download | binutils-redhat-f099e2bc28a1ba73914754d2b42a0db827281cd9.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cplus-dem.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 2c1252f4c3..dc926382a8 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,8 +1,3 @@ -2011-03-04 Michael Snyder <msnyder@vmware.com> - - * cplus-dem.c (ada_demangle): Stop memory leak. - Also fix a one line indent problem. - 2011-02-28 Kai Tietz <kai.tietz@onevision.com> * filename_cmp.c (filename_ncmp): New function. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 6cd9a414f7..84f94b6a8d 100644 --- a/libiberty/cplus-dem.c +++ b/libiberty/cplus-dem.c @@ -883,7 +883,7 @@ ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED) int len0; const char* p; char *d; - char *demangled = NULL; + char *demangled; /* Discard leading _ada_, which is used for library level subprograms. */ if (strncmp (mangled, "_ada_", 5) == 0) @@ -1129,11 +1129,10 @@ ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED) unknown: len0 = strlen (mangled); - free (demangled); demangled = XNEWVEC (char, len0 + 3); if (mangled[0] == '<') - strcpy (demangled, mangled); + strcpy (demangled, mangled); else sprintf (demangled, "<%s>", mangled); |