Merge pull request #203 from Runemoro/fix-cfr

Fix CFR-related bugs

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java b/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
index b9cdbea..e265d9d 100644
--- a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
+++ b/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
@@ -82,7 +82,7 @@ public class EnigmaDumper implements Dumper {
     }
 
     private MethodEntry getMethodEntry(MethodPrototype method) {
-        if (method.getClassType() == null) {
+        if (method == null || method.getClassType() == null) {
             return null;
         }
 
@@ -97,7 +97,7 @@ public class EnigmaDumper implements Dumper {
     private LocalVariableEntry getParameterEntry(MethodPrototype method, int parameterIndex, String name) {
         int variableIndex = method.isInstanceMethod() ? 1 : 0;
         for (int i = 0; i < parameterIndex; i++) {
-            variableIndex += method.getArgs().get(parameterIndex).getStackType().getComputationCategory();
+            variableIndex += method.getArgs().get(i).getStackType().getComputationCategory();
         }
 
         return new LocalVariableEntry(getMethodEntry(method), variableIndex, name, true, null);