Changeset: 12caf841e33b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12caf841e33b
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: linear-hashing
Log Message:
Fix leakage reported by Coverity
diffs (33 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
@@ -1518,8 +1518,13 @@ mat_group_derive(MalBlkPtr mb, InstrPtr
pushInstruction(mb,q);
if(setPartnr(ml, getArg(ml->v[b].mi,i), getArg(q,0), i) ||
setPartnr(ml, getArg(ml->v[b].mi,i), getArg(q,1), i) ||
- setPartnr(ml, getArg(ml->v[b].mi,i), getArg(q,2), i))
+ setPartnr(ml, getArg(ml->v[b].mi,i), getArg(q,2), i)){
+ freeInstruction(r0);
+ freeInstruction(r1);
+ freeInstruction(r2);
+ freeInstruction(attr);
return -1;
+ }
/* add result to mats */
r0 = addArgument(mb,r0,getArg(q,0));
@@ -1530,8 +1535,13 @@ mat_group_derive(MalBlkPtr mb, InstrPtr
getArg(r, 0) = newTmpVariable(mb, atp);
r = addArgument(mb, r, getArg(q,1));
r = addArgument(mb, r, getArg(ml->v[b].mi,i));
- if(setPartnr(ml, getArg(ml->v[b].mi,i), getArg(r,0), i))
+ if(setPartnr(ml, getArg(ml->v[b].mi,i), getArg(r,0), i)){
+ freeInstruction(r0);
+ freeInstruction(r1);
+ freeInstruction(r2);
+ freeInstruction(attr);
return -1;
+ }
pushInstruction(mb,r);
attr = addArgument(mb, attr, getArg(r, 0));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
