X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=c364df9f7613178e2453d05bd667f64f44ed4fde;hb=cef10a2b49af5da16ffe59c5b9ddd210c668fbac;hp=b33d24739ca89399ffb363c1ba3bdecd61ca6dc2;hpb=ae7fcd2e5e499f72d9d1530bdc293f4fbc5f0644;p=c11tester.git

diff --git a/nodestack.cc b/nodestack.cc
index b33d2473..c364df9f 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -325,8 +325,11 @@ const ModelAction * Node::get_read_from() {
 bool Node::increment_read_from() {
 	DBG();
 	promises.clear();
-	read_from_index++;
-	return (read_from_index < may_read_from.size());
+	if (read_from_index < may_read_from.size()) {
+		read_from_index++;
+		return read_from_index < may_read_from.size();
+	}
+	return false;
 }
 
 /**
@@ -336,8 +339,11 @@ bool Node::increment_read_from() {
 bool Node::increment_future_value() {
 	DBG();
 	promises.clear();
-	future_index++;
-	return (future_index < (int)future_values.size());
+	if (future_index < ((int)future_values.size())) {
+		future_index++;
+		return (future_index < ((int)future_values.size()));
+	}
+	return false;
 }
 
 void Node::explore(thread_id_t tid)