MonetDB: Jun2016 - Memory leaks.

[Sjoerd Mullender]

Changeset: a630248289a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a630248289a2
Modified Files:
        monetdb5/mal/mal_parser.c
        monetdb5/modules/mal/groupby.c
        sql/server/sql_atom.c
Branch: Jun2016
Log Message:

Memory leaks.


diffs (34 lines):

diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -795,6 +795,7 @@ helpInfo(Client cntxt, str *help)
        if (MALkeyword(cntxt, "comment", 7)) {
                skipSpace(cntxt);
                if ((l = stringLength(cntxt))) {
+                       GDKfree(*help);
                        *help = strCopy(cntxt, l);
                        if (*help)
                                advance(cntxt, l - 1);
diff --git a/monetdb5/modules/mal/groupby.c b/monetdb5/modules/mal/groupby.c
--- a/monetdb5/modules/mal/groupby.c
+++ b/monetdb5/modules/mal/groupby.c
@@ -145,6 +145,7 @@ GROUPdelete(AGGRtask *a){
        for(a->last--; a->last>=0; a->last--){
                BBPunfix(a->cols[a->last]->batCacheid);
        }
+       GDKfree(a->bid);
        GDKfree(a->cols);
        GDKfree(a->unique);
        GDKfree(a);
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -258,7 +258,7 @@ atom_general(sql_allocator *sa, sql_subt
                        VALset(&a->data, a->data.vtype, p);
                        SA_VALcopy(sa, &a->data, &a->data);
 
-                       if (p && ATOMextern(a->data.vtype) == 0)
+                       if (p && ATOMextern(a->data.vtype))
                                GDKfree(p);
                        /*_DELETE(val);*/
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list