X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=d5425e335dad86614b4e09db71717e0b00dfe2d2;hb=ea0cb2585eee658354f48b4bbfebaf030cccf317;hp=28bba4d003176c405f0ed65720639052aa6c3929;hpb=eb3b6cccf71b9eeee035e2c98566dfa279e402ae;p=model-checker.git

diff --git a/nodestack.cc b/nodestack.cc
index 28bba4d..d5425e3 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -325,9 +325,9 @@ const ModelAction * Node::get_read_from() {
 bool Node::increment_read_from() {
 	DBG();
 	promises.clear();
-	if ((read_from_index+1) < may_read_from.size()) {
+	if (read_from_index < may_read_from.size()) {
 		read_from_index++;
-		return true;
+		return read_from_index < may_read_from.size();
 	}
 	return false;
 }
@@ -339,9 +339,9 @@ bool Node::increment_read_from() {
 bool Node::increment_future_value() {
 	DBG();
 	promises.clear();
-	if ((future_index+1) < ((int)future_values.size())) {
+	if (future_index < ((int)future_values.size())) {
 		future_index++;
-		return true;
+		return (future_index < ((int)future_values.size()));
 	}
 	return false;
 }
@@ -418,6 +418,8 @@ void NodeStack::pop_restofstack(int numAhead)
 {
 	/* Diverging from previous execution; clear out remainder of list */
 	unsigned int it=iter+numAhead;
+	for(unsigned int i=it;i<node_list.size();i++)
+		delete node_list[i];
 	node_list.resize(it);
 }