Fixes null captured parameters

[jpf-core.git] / src / main / gov / nasa / jpf / vm / FunctionObjectFactory.java

diff --git a/src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java b/src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java
index de61be012fb5b6f9a9a23b56f054db071ec1f3be..a96f932c4b5da78e736d555de185e90f376d8424 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java
+++ b/src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java
@@ -61,8 +61,12 @@ public class FunctionObjectFactory {
       } else if (typeName.equals("boolean")) {
         fields.setBooleanValue(i, (Boolean)freeVarValues[i]);
       } else {
-        int val = ((ElementInfo)freeVarValues[i]).getObjectRef();
-        fields.setReferenceValue(i, val);
+        if(freeVarValues[i] == null) {
+          fields.setReferenceValue(i, MJIEnv.NULL); 
+        } else {
+          int val = ((ElementInfo)freeVarValues[i]).getObjectRef();
+          fields.setReferenceValue(i, val);
+        }
       }
     }
   }