MonetDB: Jan2014 - Defense line against null pointer dereference.

[Martin Kersten]

Changeset: bd6fddbf483c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd6fddbf483c
Modified Files:
        monetdb5/optimizer/opt_wrapper.c
Branch: Jan2014
Log Message:

Defense line against null pointer dereference.


diffs (15 lines):

diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -133,8 +133,11 @@ str OPTwrapper (Client cntxt, MalBlkPtr 
        char optimizer[256];
        InstrPtr q= copyInstruction(p);
 
+       if( p == NULL)
+               throw(MAL, "opt_wrapper", "missing optimizer statement");
        optimizerInit();
        snprintf(optimizer,256,"%s", fcnnme = getFunctionId(p));
+       q= copyInstruction(p);
        OPTIMIZERDEBUG 
                mnstr_printf(cntxt->fdout,"=APPLY OPTIMIZER %s\n",fcnnme);
        if( p && p->argc > 1 ){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list