Changeset: ba9f3e4de5fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba9f3e4de5fc
Modified Files:
monetdb5/ChangeLog.Dec2016
monetdb5/mal/mal_stack.c
Branch: Dec2016
Log Message:
Deal with NULL pointer.
diffs (27 lines):
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,3 +1,7 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org>
+- Fixed a bug causing a crash during cleanup when mserver5 is stopped
+ with monetdb stop database.
+
diff --git a/monetdb5/mal/mal_stack.c b/monetdb5/mal/mal_stack.c
--- a/monetdb5/mal/mal_stack.c
+++ b/monetdb5/mal/mal_stack.c
@@ -94,8 +94,10 @@ reallocGlobalStack(MalStkPtr old, int cn
void
freeStack(MalStkPtr stk)
{
- clearStack(stk);
- GDKfree(stk);
+ if (stk != NULL) {
+ clearStack(stk);
+ GDKfree(stk);
+ }
}
void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
