MonetDB: Jun2016 - fixed leak in new mat_joinNxM

[Niels Nes]

Changeset: 0843a2426bfa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0843a2426bfa
Modified Files:
        monetdb5/optimizer/opt_mergetable.c
Branch: Jun2016
Log Message:

fixed leak in new mat_joinNxM


diffs (19 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
@@ -716,6 +716,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, 
                int nr_mv1 = split, nr_mv2 = nr_mats-split;
 
                if (split < 0) {
+                       GDKfree(mats);
                        mb->errors++;
                        return ;
                }
@@ -767,6 +768,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, 
        }
        mat_add(ml, l, mat_none, getFunctionId(p));
        mat_add(ml, r, mat_none, getFunctionId(p));
+       GDKfree(mats);
 }
 
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list