merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index afa8c6b3bd90eb3ba494e0f195f26a1b7f99d806..dd1c1a301fccb8689bac410bd3a5b684e1128568 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-23  Matthew Gingell  <gingell@adacore.com>
+
+       * cplus-dem.c (ada_demangle): Ensure demangled is freed.
+
 2009-09-22  Ozkan Sezer  <sezeroz@gmail.com>
 
        * choose-temp.c: Include unistd.h for mingw targets.

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 416746753660e6bb4c909f91f503258a4ad0b7d4..66285141ffa2ff6f6caaa4f5effa59f957bc9349 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -984,7 +984,10 @@ ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED)
       goto Suppress;
 
   if (! changed)
-    return NULL;
+    {
+      free (demangled);
+      return NULL;
+    }
   else
     return demangled;