MonetDB: Jun2016 - Memory leaks.

[Sjoerd Mullender]

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

Memory leaks.


diffs (25 lines):

diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -417,6 +417,8 @@ DFLOWworker(void *T)
                        /* only collect one error (from one thread, needed for 
stable testing) */
                        if (!flow->error)
                                flow->error = error;
+                       else
+                               GDKfree(error);
                        MT_lock_unset(&flow->flowlock);
                        /* after an error we skip the rest of the block */
                        q_enqueue(flow->done, fe);
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,8 +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))
-                               GDKfree(p);
+                       GDKfree(p);
                        /*_DELETE(val);*/
                }
        } else { 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list