From d10153cfc6cb319a75ceb3e3d34ac30efa17e518 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 3 Aug 2016 08:27:56 -0600 Subject: [PATCH] Avoid potential memory leak in find_frame_funname The PR 18565 thread pointed out that, if cp_remove_params can throw (we aren't quite sure), then find_frame_funname could leak some memory. This patch avoids any potential issue by rearranging some code in find_frame_funname. Built and regtested on x86-64 Fedora 24. 2016-08-03 Tom Tromey * stack.c (find_frame_funname): Avoid any possible leak in case cp_remove_params can throw. --- gdb/ChangeLog | 5 +++++ gdb/stack.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b2fb9c5569..48ecd6771ca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-08-03 Tom Tromey + + * stack.c (find_frame_funname): Avoid any possible leak in case + cp_remove_params can throw. + 2016-08-03 Tom Tromey * NEWS: Mention new Python breakpoint events. diff --git a/gdb/stack.c b/gdb/stack.c index b9e74dfbae4..e890949c06c 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1101,7 +1101,8 @@ find_frame_funname (struct frame_info *frame, char **funname, } else { - *funname = xstrdup (SYMBOL_PRINT_NAME (func)); + const char *print_name = SYMBOL_PRINT_NAME (func); + *funlang = SYMBOL_LANGUAGE (func); if (funcp) *funcp = func; @@ -1112,14 +1113,17 @@ find_frame_funname (struct frame_info *frame, char **funname, stored in the symbol table, but we stored a version with DMGL_PARAMS turned on, and here we don't want to display parameters. So remove the parameters. */ - char *func_only = cp_remove_params (*funname); + char *func_only = cp_remove_params (print_name); if (func_only) - { - xfree (*funname); - *funname = func_only; - } + *funname = func_only; } + + /* If we didn't hit the C++ case above, set *funname here. + This approach is taken to avoid having to install a + cleanup in case cp_remove_params can throw. */ + if (*funname == NULL) + *funname = xstrdup (print_name); } } else -- 2.30.2