Changeset: 3ab84718f7e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ab84718f7e1
Modified Files:
monetdb5/optimizer/opt_evaluate.mx
Branch: Dec2011
Log Message:
Off-by-one error causing several crashes and incorrect answers.
This fixes changeset 8dc454f36317.
diffs (15 lines):
diff --git a/monetdb5/optimizer/opt_evaluate.mx
b/monetdb5/optimizer/opt_evaluate.mx
--- a/monetdb5/optimizer/opt_evaluate.mx
+++ b/monetdb5/optimizer/opt_evaluate.mx
@@ -213,9 +213,9 @@ OPTevaluateImplementation(Client cntxt,
/* You may not overwrite constants. They may
be used by
* other instructions */
nvar = getArg(p, 1) = defConstant(mb,
getArgType(mb, p, 0), &cst);
- if (nvar > env->stktop) {
+ if (nvar >= env->stktop) {
VALcopy(&env->stk[getArg(p, 1)],
&getVarConstant(mb, getArg(p, 1)));
- env->stktop = getArg(p, 1);
+ env->stktop = getArg(p, 1) + 1;
}
alias[getArg(p, 0)] = getArg(p, 1);
p->argc = 2;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
