diff options
| author | Andrew Burgess <aburgess@broadcom.com> | 2014-05-27 11:57:33 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2014-06-11 11:41:51 +0100 |
| commit | 173373c6f6388171d1d62a217fae90a052395be2 (patch) | |
| tree | 5af385b647b127628d2fbd0f4e8426bb82fe79fd | |
| parent | 364fe1f72265eb54bce08511233d06ed48e9c41a (diff) | |
Delete temporary string within demangler even in failure cases.gdb-7.8-branchpoint
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.
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cplus-dem.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 8390e4c7841..ddd96cce82a 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2014-06-11 Andrew Burgess <aburgess@broadcom.com> + + * cplus-dem.c (do_type): Call string_delete even if the call to + demangle_template fails. + 2014-06-01 Ray Donnelly <mingw.android@gmail.com> * pex-win32.c (argv_to_cmdline): Don't quote diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 2dd0a8a5c84..52767cc8fde 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') { |