Disassembler robustness against invalid CLOSURE (with inline upvalues)

cyborgA0 · Mar 19, 2021 · aea1730 · aea1730
1 parent 2a6d955
commit aea1730
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/unluac/decompile/Code.java b/src/unluac/decompile/Code.java
@@ -27,9 +27,14 @@ public Code(LFunction function) {
       for(int i = 0; i < length; i++) {
         int line = i + 1;
         if(op(line) == Op.CLOSURE) {
-          int nups = function.functions[Bx(line)].numUpvalues;
-          for(int j = 1; j <= nups; j++) {
-            upvalue[i + j] = true;
+          int f = Bx(line);
+          if(f < function.functions.length) {
+            int nups = function.functions[f].numUpvalues;
+            for(int j = 1; j <= nups; j++) {
+              if(i + j < length) {
+                upvalue[i + j] = true;
+              }
+            }
           }
         }
       }