MonetDB: default - Avoid dangling pointer

[Martin Kersten]

Changeset: f5b193866ecf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5b193866ecf
Modified Files:
        monetdb5/mal/mal_module.c
        monetdb5/optimizer/Tests/tst4000.malC
        monetdb5/optimizer/Tests/tst4003.malC
        monetdb5/optimizer/Tests/tst4010.malC
Branch: default
Log Message:

Avoid dangling pointer


diffs (45 lines):

diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c
--- a/monetdb5/mal/mal_module.c
+++ b/monetdb5/mal/mal_module.c
@@ -44,7 +44,7 @@ mal_module_reset(void)
 {
        Module m,n;
 
-       for( m = moduleChain; m; ){
+       for( m = moduleChain, moduleChain = 0; m; ){
                n = m->next;
                freeModule(m);
                m= n;
diff --git a/monetdb5/optimizer/Tests/tst4000.malC 
b/monetdb5/optimizer/Tests/tst4000.malC
--- a/monetdb5/optimizer/Tests/tst4000.malC
+++ b/monetdb5/optimizer/Tests/tst4000.malC
@@ -11,7 +11,6 @@ l:= k1+k2;
 l2:= k1+k2;             # mapped to l
 l3:= l2+k1;             # replace the alias
 end;
-optimizer.setDebug();
 optimizer.commonTerms("user","foo");
 optimizer.aliases("user","foo");
 mdb.List("user","foo");
diff --git a/monetdb5/optimizer/Tests/tst4003.malC 
b/monetdb5/optimizer/Tests/tst4003.malC
--- a/monetdb5/optimizer/Tests/tst4003.malC
+++ b/monetdb5/optimizer/Tests/tst4003.malC
@@ -6,7 +6,6 @@ c:= bat.new(:str);       # identical unt
 d:= algebra.subselect(b,"hello","world",true,true,false);
 e:= algebra.subselect(b,"hello","world",true,true,false);    # mapped onto one 
instruction
 end foo;
-optimizer.setDebug();
 optimizer.commonTerms("user,","foo");
 optimizer.aliases("user,","foo");
 mdb.List("user","foo");
diff --git a/monetdb5/optimizer/Tests/tst4010.malC 
b/monetdb5/optimizer/Tests/tst4010.malC
--- a/monetdb5/optimizer/Tests/tst4010.malC
+++ b/monetdb5/optimizer/Tests/tst4010.malC
@@ -10,7 +10,6 @@ d:= bat.new(:int);
 bat.append(d,2);
 end;
 
-optimizer.setDebug();
 optimizer.commonTerms("user,","foo");
 optimizer.aliases("user,","foo");
 mdb.List("user","foo");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list