MonetDB: Oct2014 - Avoid possible leakage

[Martin Kersten]

Changeset: 31c12970e4a3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31c12970e4a3
Modified Files:
        sql/backends/monet5/generator/generator.c
Branch: Oct2014
Log Message:

Avoid possible leakage


diffs (28 lines):

diff --git a/sql/backends/monet5/generator/generator.c 
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -821,7 +821,7 @@ str VLTgenerator_join(Client cntxt, MalB
        BAT  *b, *bl = NULL, *br = NULL, *bln = NULL, *brn= NULL;
        BUN cnt,c =0;
        oid o= 0, *ol, *or;
-       int tpe, incr=0;
+       int tpe, incr=0, materialized = 0;
        InstrPtr p = NULL, q = NULL;
        str msg = MAL_SUCCEED;
 
@@ -850,6 +850,7 @@ str VLTgenerator_join(Client cntxt, MalB
                        throw(MAL,"generator.join","Join over generator pairs 
not supported");
                else
                        p = NULL;
+               materialized =1;
        }
 
        // switch roles to have a single target bat[:oid,:any] designated 
@@ -927,5 +928,7 @@ str VLTgenerator_join(Client cntxt, MalB
                BBPkeepref(*getArgReference_bat(stk,pci,0)= bln->batCacheid);
                BBPkeepref(*getArgReference_bat(stk,pci,1)= brn->batCacheid);
        }
+       if ( materialized)
+               BBPreclaim(bl);
        return msg;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list