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-param.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-param.c')
| -rw-r--r-- | gdb/guile/scm-param.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c index cc10806..53120cb 100644 --- a/gdb/guile/scm-param.c +++ b/gdb/guile/scm-param.c @@ -1006,6 +1006,7 @@ gdbscm_register_parameter_x (SCM self) _("parameter exists, \"show\" command is already defined")); } + gdbscm_gdb_exception exc {}; try { add_setshow_generic (p_smob->type, p_smob->cmd_class, @@ -1020,9 +1021,10 @@ gdbscm_register_parameter_x (SCM self) } catch (const gdb_exception &except) { - GDBSCM_HANDLE_GDB_EXCEPTION (except); + exc = unpack (except); } + GDBSCM_HANDLE_GDB_EXCEPTION (exc); /* Note: At this point the parameter exists in gdb. So no more errors after this point. */ @@ -1056,7 +1058,7 @@ gdbscm_parameter_value (SCM self) struct cmd_list_element *alias, *prefix, *cmd; char *newarg; int found = -1; - struct gdb_exception except; + gdbscm_gdb_exception except {}; gdb::unique_xmalloc_ptr<char> name = gdbscm_scm_to_host_string (self, NULL, &except_scm); @@ -1069,7 +1071,7 @@ gdbscm_parameter_value (SCM self) } catch (const gdb_exception &ex) { - except = ex; + except = unpack (ex); } xfree (newarg); |