Changeset: 74f84fcba02f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74f84fcba02f
Modified Files:
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/UDF/pyapi/connection.c
Branch: linear-hashing
Log Message:
Coverity fixes.
diffs (34 lines):
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
@@ -309,8 +309,10 @@ mat_delta(matlist_t *ml, MalBlkPtr mb, I
for(j=1; j < mat[m].mi->argc; j++) {
if (overlap(ml, getArg(mat[e].mi, k),
getArg(mat[m].mi, j), k, j, 0)){
InstrPtr q = copyInstruction(p);
- if(!q)
+ if(!q){
+ freeInstruction(r);
return NULL;
+ }
/* remove last argument (inserts only
on last part) */
if (k < mat[m].mi->argc-1)
@@ -777,6 +779,7 @@ mat_join2(MalBlkPtr mb, InstrPtr p, matl
if(propagatePartnr(ml, getArg(mat[m].mi, k),
getArg(q,0), nr) ||
propagatePartnr(ml, getArg(mat[n].mi, j),
getArg(q,1), nr)) {
freeInstruction(r);
+ freeInstruction(l);
return -1;
}
diff --git a/sql/backends/monet5/UDF/pyapi/connection.c
b/sql/backends/monet5/UDF/pyapi/connection.c
--- a/sql/backends/monet5/UDF/pyapi/connection.c
+++ b/sql/backends/monet5/UDF/pyapi/connection.c
@@ -106,6 +106,7 @@ static PyObject *_connection_execute(Py_
}
} else {
PyErr_Format(PyExc_Exception, "Loopback queries are not
supported in parallel.");
+ GDKfree(query);
return NULL;
}
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
