Changeset: 70a5110e5027 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70a5110e5027
Modified Files:
        monetdb5/optimizer/opt_generator.c
Branch: default
Log Message:

add type checks to generator optimizer (fixes crashes in typecast bug)


diffs (22 lines):

diff --git a/monetdb5/optimizer/opt_generator.c 
b/monetdb5/optimizer/opt_generator.c
--- a/monetdb5/optimizer/opt_generator.c
+++ b/monetdb5/optimizer/opt_generator.c
@@ -32,15 +32,18 @@ pushInstruction(mb,P);
                        q= newStmt(mb,calcRef,TPE##Ref);\
                        setArgType(mb,q,0,TYPE_##TPE);\
                        pushArgument(mb,q,getArg(series[k],1));\
+                       typeChecker(cntxt->fdout, cntxt->nspace, mb, q, TRUE);\
                        p = pushArgument(mb,p, getArg(q,0));\
                        q= newStmt(mb,calcRef,TPE##Ref);\
                        setArgType(mb,q,0,TYPE_##TPE);\
                        pushArgument(mb,q,getArg(series[k],2));\
+                       typeChecker(cntxt->fdout, cntxt->nspace, mb, q, TRUE);\
                        p = pushArgument(mb,p, getArg(q,0));\
                        if( p->argc == 4){\
                                q= newStmt(mb,calcRef,TPE##Ref);\
                                setArgType(mb,q,0,TYPE_##TPE);\
                                pushArgument(mb,q,getArg(series[k],3));\
+                               typeChecker(cntxt->fdout, cntxt->nspace, mb, q, 
TRUE);\
                                p = pushArgument(mb,p, getArg(q,0));\
                        }\
                        setModuleId(p,generatorRef);\
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to