From 680d7fd5fcff860a31021845389d4dfeb7b42e3c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 24 Apr 2019 06:50:01 -0600 Subject: 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 * 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. --- gdb/guile/scm-lazy-string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/guile/scm-lazy-string.c') diff --git a/gdb/guile/scm-lazy-string.c b/gdb/guile/scm-lazy-string.c index 4d69b23..b0bbc82 100644 --- a/gdb/guile/scm-lazy-string.c +++ b/gdb/guile/scm-lazy-string.c @@ -338,7 +338,7 @@ lsscm_safe_lazy_string_to_value (SCM string, int arg_pos, } catch (const gdb_exception &except) { - *except_scmp = gdbscm_scm_from_gdb_exception (except); + *except_scmp = gdbscm_scm_from_gdb_exception (unpack (except)); return NULL; } -- cgit v1.1