From: rtrimana <rtrimana@uci.edu>
Date: Wed, 16 Oct 2019 18:52:22 +0000 (-0700)
Subject: Fixing a few bugs. Still need to check for the backtrack analysis.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=002a8495908c7ff962108ee075e96bbba1ad61d6;p=jpf-core.git

Fixing a few bugs. Still need to check for the backtrack analysis.
---

diff --git a/src/main/gov/nasa/jpf/listener/StateReducer.java b/src/main/gov/nasa/jpf/listener/StateReducer.java
index 82e8cf8..e594c28 100644
--- a/src/main/gov/nasa/jpf/listener/StateReducer.java
+++ b/src/main/gov/nasa/jpf/listener/StateReducer.java
@@ -162,7 +162,7 @@ public class StateReducer extends ListenerAdapter {
     for(IntChoiceFromSet cg : cgMap.keySet()) {
       int event = cgMap.get(cg);
       LinkedList<Integer[]> choiceLists = backtrackMap.get(event);
-      if (choiceLists.peekFirst() != null) {
+      if (choiceLists != null && choiceLists.peekFirst() != null) {
         Integer[] choiceList = choiceLists.removeFirst();
         // Deploy the new choice list for this CG
         cg.setNewValues(choiceList);