diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-04-24 06:50:01 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-04-25 12:59:35 -0600 |
| commit | 680d7fd5fcff860a31021845389d4dfeb7b42e3c (patch) | |
| tree | 0065f8d560b3148a3a3dceb5e3e34ab724cc7cba /gdb/guile/scm-block.c | |
| parent | c6fdd8b2052baa9b7a27d4d34f109c9622b53509 (diff) | |
| download | binutils-680d7fd5fcff860a31021845389d4dfeb7b42e3c.zip binutils-680d7fd5fcff860a31021845389d4dfeb7b42e3c.tar.gz binutils-680d7fd5fcff860a31021845389d4dfeb7b42e3c.tar.bz2 | |
Avoid undefined behavior in Guile exception handling
The Guile code will longjmp (via scm_throw) when an object requiring
destruction is on the stack. This is undefined behavior.
This changes this code to run any destructors in inner scopes, and to
pass a POD to gdbscm_throw_gdb_exception.
gdb/ChangeLog
2019-04-25 Tom Tromey <tromey@adacore.com>
* guile/scm-exception.c (gdbscm_scm_from_gdb_exception)
(gdbscm_throw_gdb_exception): Take a gdbscm_gdb_exception.
* guile/scm-block.c, guile/scm-breakpoint.c, guile/scm-cmd.c,
guile/scm-disasm.c, guile/scm-frame.c, guile/scm-lazy-string.c,
guile/scm-math.c, guile/scm-param.c, guile/scm-ports.c,
guile/scm-symbol.c, guile/scm-symtab.c, guile/scm-type.c,
guile/scm-value.c: Use unpack.
* guile/guile-internal.h (gdbscm_scm_from_gdb_exception): Take a
gdbscm_gdb_exception.
(gdbscm_throw_gdb_exception): Likewise.
(struct gdbscm_gdb_exception): New.
(unpack): New function.
(gdbscm_wrap): Use unpack.
Diffstat (limited to 'gdb/guile/scm-block.c')
| -rw-r--r-- | gdb/guile/scm-block.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index 2114ca1..fbb2f4a 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -680,6 +680,7 @@ gdbscm_lookup_block (SCM pc_scm) gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, NULL, "U", pc_scm, &pc); + gdbscm_gdb_exception exc {}; try { cust = find_pc_compunit_symtab (pc); @@ -689,9 +690,10 @@ gdbscm_lookup_block (SCM pc_scm) } catch (const gdb_exception &except) { - GDBSCM_HANDLE_GDB_EXCEPTION (except); + exc = unpack (except); } + GDBSCM_HANDLE_GDB_EXCEPTION (exc); if (cust == NULL || COMPUNIT_OBJFILE (cust) == NULL) { gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG1, pc_scm, |