MonetDB: Jul2017 - Only look at sql->args[e->flag] it it actuall...

[Sjoerd Mullender]

Changeset: 5a15df80e312 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a15df80e312
Modified Files:
        sql/server/rel_exp.c
Branch: Jul2017
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.


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
@@ -1291,7 +1291,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