MonetDB: Jan2014 - A few more Coverity errors

[Martin Kersten]

Changeset: 45c2e9b4f606 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45c2e9b4f606
Modified Files:
        monetdb5/modules/mal/bbp.c
        monetdb5/optimizer/opt_mapreduce.c
Branch: Jan2014
Log Message:

A few more Coverity errors


diffs (35 lines):

diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -390,6 +390,7 @@ CMDdecompressheap(Heap *h, Heap *hn, str
                close_stream(fp);
                return 1;
        }
+       close_stream(fp);
 #else
        (void) h;
        (void) hn;
@@ -650,7 +651,7 @@ CMDbbpdestroyBAT(Client cntxt, MalBlkPtr
        bit ret = 0;
        int *bid;
        bit *immediate;
-       str msg;
+       str msg= MAL_SUCCEED;
 
        (void) cntxt;
        bid = (int *) getArgReference(stk, pci, 1);
diff --git a/monetdb5/optimizer/opt_mapreduce.c 
b/monetdb5/optimizer/opt_mapreduce.c
--- a/monetdb5/optimizer/opt_mapreduce.c
+++ b/monetdb5/optimizer/opt_mapreduce.c
@@ -515,10 +515,7 @@ OPTmapreduceImplementation(
        snprintf(nme, IDLENGTH, "%smap", getFunctionId(getInstrPtr(reduce, 0)));
 
        /* zap */
-       if (newMalBlkStmt(map, map->ssize) < 0) {
-               return 0;
-       }
-       if (newMalBlkStmt(reduce, reduce->ssize) < 0) {
+       if (newMalBlkStmt(map, map->ssize) < 0 || newMalBlkStmt(reduce, 
reduce->ssize) < 0) {
                freeMalBlk(map);
                return 0;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list