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.
This commit is contained in:
Simon Marchi 2015-10-26 08:41:36 -04:00
parent cdfb4fc32d
commit 74ef968fba
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2015-10-26 Simon Marchi <simon.marchi@polymtl.ca>
* guile/scm-symbol.c (gdbscm_lookup_global_symbol): Add
domain_enum cast.
(gdbscm_lookup_symbol): Likewise.
2015-10-25 Iain Buclaw <ibuclaw@gdcproject.org>
* d-exp.y: Remove an obsolete comment and propagate the block

View File

@ -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)
{