MonetDB: Oct2014 - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 08ed4159a03e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08ed4159a03e
Modified Files:
        gdk/gdk_imprints.c
Branch: Oct2014
Log Message:

Merge with Jan2014 branch.


diffs (25 lines):

diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -875,14 +875,15 @@ IMPSremove(BAT *b)
        assert(!VIEWtparent(b));
 
        MT_lock_set(&GDKimprintsLock(abs(b->batCacheid)), "BATimprints");
-       imprints = b->T->imprints;
-       b->T->imprints = NULL;
+       if ((imprints = b->T->imprints) != NULL) {
+               b->T->imprints = NULL;
 
-       HEAPdelete(imprints->imprints, BBP_physical(b->batCacheid),
-                  b->batCacheid > 0 ? "timprints" : "himprints");
+               HEAPdelete(imprints->imprints, BBP_physical(b->batCacheid),
+                          b->batCacheid > 0 ? "timprints" : "himprints");
 
-       GDKfree(imprints->imprints);
-       GDKfree(imprints);
+               GDKfree(imprints->imprints);
+               GDKfree(imprints);
+       }
 
        MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), "BATimprints");
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list