From: Brian Demsky Date: Tue, 7 Apr 2020 22:57:11 +0000 (-0700) Subject: more bug fixes X-Git-Url: http://demsky.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=f4c344cc8e76cd1b8271329f8827be2b4c503a6a more bug fixes --- diff --git a/actionlist.cc b/actionlist.cc index 3ffaa383..e76f5aed 100644 --- a/actionlist.cc +++ b/actionlist.cc @@ -168,8 +168,8 @@ void decrementCount(allnode * ptr) { decrementCount(ptr->parent); } } + delete ptr; } - delete ptr; } } @@ -204,7 +204,7 @@ void actionlist::removeAction(ModelAction * act) { } if (first) { //see if previous node has same clock as us... - if (llnodeprev->val->get_seq_number() == clock) { + if (llnodeprev != NULL && llnodeprev->val->get_seq_number() == clock) { ptr->children[index] = reinterpret_cast(((uintptr_t)llnodeprev) | ISACT); } else { //remove ourselves and go up tree