MonetDB: linear-hashing - More Coverity fixes

[Martin Kersten]

Changeset: 76ec87bc4305 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76ec87bc4305
Modified Files:
        monetdb5/optimizer/opt_macro.c
        monetdb5/optimizer/opt_mergetable.c
        sql/backends/monet5/sql.c
Branch: linear-hashing
Log Message:

More Coverity fixes


diffs (49 lines):

diff --git a/monetdb5/optimizer/opt_macro.c b/monetdb5/optimizer/opt_macro.c
--- a/monetdb5/optimizer/opt_macro.c
+++ b/monetdb5/optimizer/opt_macro.c
@@ -171,6 +171,7 @@ inlineMALblock(MalBlkPtr mb, int pc, Mal
                ns[k] = copyInstruction(q);
                if( ns[k] == NULL){
                        GDKfree(nv);
+                       GDKfree(ns);
                        return -1;
                }
 
diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1204,6 +1204,7 @@ mat_group_aggr(MalBlkPtr mb, InstrPtr p,
                InstrPtr q = copyInstruction(p);
                if(!q) {
                        freeInstruction(ai1);
+                       freeInstruction(ai10);
                        return -1;
                }
 
@@ -1675,8 +1676,10 @@ mat_topn(MalBlkPtr mb, InstrPtr p, matli
                cst.val.lval= 0;
                cst.len = 0;
                zero = defConstant(mb, cst.vtype, &cst);
-               if( zero < 0)
+               if( zero < 0){
+                       freeInstruction(pck);
                        return -1;
+               }
        }
        assert( (n<0 && o<0) || 
                (ml->v[m].mi->argc == ml->v[n].mi->argc && 
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2780,8 +2780,10 @@ mvc_export_row_wrap( Client cntxt, MalBl
                        goto wrapup_result_set;
                }
        }
-       if (mvc_export_result(cntxt->sqlcontext, s, res, strcmp(filename, 
"stdout") == 0, mb->starttime, mb->optimize))
+       if (mvc_export_result(cntxt->sqlcontext, s, res, strcmp(filename, 
"stdout") == 0, mb->starttime, mb->optimize)){
                msg = createException(SQL, "sql.resultset", SQLSTATE(45000) 
"Result set construction failed");
+               goto wrapup_result_set;
+       }
        mb->starttime = 0;
        mb->optimize = 0;
        if (onclient) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list