diff options
| author | Tom Tromey <tom@tromey.com> | 2018-04-21 16:38:33 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-04-23 17:50:19 -0600 |
| commit | a95c7daba4c74e61ac37ffaaaa0ba49bf16e474e (patch) | |
| tree | d1faca1e89d74c600f07d762fdf4566a537762f0 | |
| parent | 458412c36845f20bcfef47eef3005fb2054a7695 (diff) | |
| download | gdb-a95c7daba4c74e61ac37ffaaaa0ba49bf16e474e.zip gdb-a95c7daba4c74e61ac37ffaaaa0ba49bf16e474e.tar.gz gdb-a95c7daba4c74e61ac37ffaaaa0ba49bf16e474e.tar.bz2 | |
Remove a cleanup from scm-frame.c
This removes a cleanup from scm-frame.c, replacing it with
unique_xmalloc_ptr and a new scope. I believe this also fixes a
latent bug involving calling do_cleanups twice for a single cleanup.
Regression tested using the gdb.guile test suite on x86-64 Fedora 26.
ChangeLog
2018-04-23 Tom Tromey <tom@tromey.com>
* guile/scm-frame.c (gdbscm_frame_read_var): Use
gdb::unique_xmalloc_ptr.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/guile/scm-frame.c | 54 |
2 files changed, 30 insertions, 29 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d18081e..bec33b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2018-04-23 Tom Tromey <tom@tromey.com> + * guile/scm-frame.c (gdbscm_frame_read_var): Use + gdb::unique_xmalloc_ptr. + +2018-04-23 Tom Tromey <tom@tromey.com> + * configure: Rebuild. 2018-04-22 Rajendra SY <rajendra.sy@gmail.com> diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index 4f4766a..7b53967 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -877,7 +877,6 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) } else if (scm_is_string (symbol_scm)) { - char *var_name; const struct block *block = NULL; struct cleanup *cleanup; struct gdb_exception except = exception_none; @@ -893,38 +892,35 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) gdbscm_throw (except_scm); } - var_name = gdbscm_scm_to_c_string (symbol_scm); - cleanup = make_cleanup (xfree, var_name); - /* N.B. Between here and the call to do_cleanups, don't do anything - to cause a Scheme exception without performing the cleanup. */ + { + gdb::unique_xmalloc_ptr<char> var_name + (gdbscm_scm_to_c_string (symbol_scm)); + /* N.B. Between here and the end of the scope, don't do anything + to cause a Scheme exception. */ + + TRY + { + struct block_symbol lookup_sym; + + if (block == NULL) + block = get_frame_block (frame, NULL); + lookup_sym = lookup_symbol (var_name.get (), block, VAR_DOMAIN, + NULL); + var = lookup_sym.symbol; + block = lookup_sym.block; + } + CATCH (ex, RETURN_MASK_ALL) + { + except = ex; + } + END_CATCH + } - TRY - { - struct block_symbol lookup_sym; - - if (block == NULL) - block = get_frame_block (frame, NULL); - lookup_sym = lookup_symbol (var_name, block, VAR_DOMAIN, NULL); - var = lookup_sym.symbol; - block = lookup_sym.block; - } - CATCH (ex, RETURN_MASK_ALL) - { - except = ex; - } - END_CATCH - - do_cleanups (cleanup); GDBSCM_HANDLE_GDB_EXCEPTION (except); if (var == NULL) - { - do_cleanups (cleanup); - gdbscm_out_of_range_error (FUNC_NAME, 0, symbol_scm, - _("variable not found")); - } - - do_cleanups (cleanup); + gdbscm_out_of_range_error (FUNC_NAME, 0, symbol_scm, + _("variable not found")); } else { |