From 948d69cbb86977ec35f30fc2b351603c38bc3ee6 Mon Sep 17 00:00:00 2001
From: Julian Dolby <juliandolby@gmail.com>
Date: Tue, 16 Oct 2018 21:43:26 -0400
Subject: [PATCH] fix for Soot: trim instruction array to avoid nulls

---
 .../com/ibm/wala/cast/ir/translator/AstTranslator.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java
index b4ccb6a59..22e9cc2f2 100644
--- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java
+++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java
@@ -1181,7 +1181,7 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
    * an {@link IncipientCFG}
    */
   protected final static class AstCFG extends AbstractCFG<SSAInstruction, PreBasicBlock> {
-    private final SSAInstruction[] instructions;
+    private SSAInstruction[] instructions;
 
     private final int[] instructionToBlockMap;
 
@@ -1364,6 +1364,12 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
           }
         }
       }
+      
+      if (instructions.length > x) {
+        SSAInstruction[] ni = new SSAInstruction[x];
+        System.arraycopy(instructions, 0, ni, 0, x);
+        instructions = ni;
+      }
     }
 
     @Override