Merge pull request pxb1988#10 from ThexXTURBOXx/develop

Fix NPE
netlovehf · Oct 2, 2021 · 2b398e6 · 2b398e6
2 parents 43238bf + 9335d9d
commit 2b398e6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/UnSSATransformer.java b/dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/UnSSATransformer.java
@@ -342,13 +342,15 @@ private void genRegGraph(IrMethod method, LiveA liveA) {
                         Local phiLocal = (Local) phiAssignStmt.getOp1();
                         RegAssign a = (RegAssign) phiLocal.tag;
                         LiveV[] frame = (LiveV[]) stmt.frame;
-                        for (LiveV v : frame) {
-                            if (v != null && v.used) {
-                                RegAssign b = (RegAssign) v.local.tag;
-                                a.excludes.add(b);
-                                b.excludes.add(a);
+						if (frame != null) {
+                            for (LiveV v : frame) {
+                                if (v != null && v.used) {
+                                    RegAssign b = (RegAssign) v.local.tag;
+                                    a.excludes.add(b);
+                                    b.excludes.add(a);
+                                }
                             }
-                        }
+						}
                     }
                 }
             }