From 173373c6f6388171d1d62a217fae90a052395be2 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Tue, 27 May 2014 11:57:33 +0100 Subject: [PATCH] Delete temporary string within demangler even in failure cases. A call to demangle_template might allocate storage within a temporary string even if the call to demangle_template eventually returns failure. This will never cause the demangler to crash, but does leak memory, as a result I've not added any tests for this. Calling string_delete is safe, even if nothing is allocated into the string, the string is initialised with string_init, so we know the internal pointers are NULL. libiberty/ChangeLog * cplus-dem.c (do_type): Call string_delete even if the call to demangle_template fails. --- libiberty/ChangeLog | 5 +++++ libiberty/cplus-dem.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 8390e4c..ddd96cc 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2014-06-11 Andrew Burgess + + * cplus-dem.c (do_type): Call string_delete even if the call to + demangle_template fails. + 2014-06-01 Ray Donnelly * pex-win32.c (argv_to_cmdline): Don't quote diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 2dd0a8a..52767cc 100644 --- a/libiberty/cplus-dem.c +++ b/libiberty/cplus-dem.c @@ -3663,7 +3663,10 @@ do_type (struct work_stuff *work, const char **mangled, string *result) string_delete (&temp); } else - break; + { + string_delete (&temp); + break; + } } else if (**mangled == 'Q') { -- 2.7.4