aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2015-10-26 08:41:36 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2015-10-26 08:41:36 -0400
commit74ef968fbaab0bd52335314abdb3e0eb04020fb1 (patch)
tree7358116fd9268114d994af02abbe281cff33f8b1
parentcdfb4fc32dfe130698fa72629aaa99aa06b50044 (diff)
downloadgdb-74ef968fbaab0bd52335314abdb3e0eb04020fb1.zip
gdb-74ef968fbaab0bd52335314abdb3e0eb04020fb1.tar.gz
gdb-74ef968fbaab0bd52335314abdb3e0eb04020fb1.tar.bz2
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.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/guile/scm-symbol.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1afb8fd..ecc286f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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
diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 81e4d50..10400be 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)
{