MonetDB: Oct2014 - Correctly deallocate in case of error.

[Sjoerd Mullender]

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

Correctly deallocate in case of error.


diffs (18 lines):

diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2763,11 +2763,12 @@ dogroupstdev(BAT **avgb, BAT *b, BAT *g,
        return bn;
 
   alloc_fail:
-       if (avgb && *avgb)
+       if (avgb)
                BBPreclaim(*avgb);
+       else
+               GDKfree(mean);
        if (bn)
                BBPreclaim(bn);
-       GDKfree(mean);
        GDKfree(delta);
        GDKfree(m2);
        GDKfree(cnts);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list