Changeset: 10aca64c0a1f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10aca64c0a1f
Modified Files:
sql/server/rel_exp.c
Branch: Dec2016
Log Message:
Only look at sql->args[e->flag] it it actually exists.
This fixes a crash that happens consistently on 32 bit architectures
in the Skyserver test.
(grafted from 5a15df80e312c0e80a8c217f53b53c506320757f)
diffs (12 lines):
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1287,7 +1287,7 @@ exp_is_zero(mvc *sql, sql_exp *e)
if (e->type == e_atom) {
if (e->l) {
return atom_is_zero(e->l);
- } else if(sql->emode == m_normal &&
EC_COMPUTE(exp_subtype(e)->type->eclass)) {
+ } else if(sql->emode == m_normal && sql->argc > e->flag &&
EC_COMPUTE(exp_subtype(e)->type->eclass)) {
return atom_is_zero(sql->args[e->flag]);
}
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
