From 74ef968fbaab0bd52335314abdb3e0eb04020fb1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 26 Oct 2015 08:41:36 -0400 Subject: [PATCH] scm-symbol.c: Add (domain_enum) casts We currently pass integers as domain_enums to lookup_symbol. The most obvious fix is to add casts there. I first thought of changing the type of the domain variables to domain_enum. However, because we pass a pointer to them to gdbscm_parse_function_args, which expects them to be integers (because of the format string), I don't think it would be correct. If the enum does not have the same size as an int, gdbscm_parse_function_args could write past the memory of domain, overwriting something else on the stack. gdb/ChangeLog: * guile/scm-symbol.c (gdbscm_lookup_global_symbol): Add domain_enum cast. (gdbscm_lookup_symbol): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/guile/scm-symbol.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1afb8fd48b7..ecc286f5e08 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-10-26 Simon Marchi + + * guile/scm-symbol.c (gdbscm_lookup_global_symbol): Add + domain_enum cast. + (gdbscm_lookup_symbol): Likewise. + 2015-10-25 Iain Buclaw * d-exp.y: Remove an obsolete comment and propagate the block diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index 81e4d50517c..10400bedb07 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -622,7 +622,8 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest) TRY { - symbol = lookup_symbol (name, block, domain, &is_a_field_of_this).symbol; + symbol = lookup_symbol (name, block, (domain_enum) domain, + &is_a_field_of_this).symbol; } CATCH (ex, RETURN_MASK_ALL) { @@ -662,7 +663,7 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest) TRY { - symbol = lookup_global_symbol (name, NULL, domain).symbol; + symbol = lookup_global_symbol (name, NULL, (domain_enum) domain).symbol; } CATCH (ex, RETURN_MASK_ALL) { -- 2.30.2