Fix rare NPE and IOOBE in writing

Vineflower · Dec 8, 2024 · 6281238 · 6281238
1 parent b0ec180
commit 6281238
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -963,7 +963,7 @@ public TextBuffer appendParamList(int indent) {
     BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
 
     // omit 'new Type[] {}' for the last parameter of a vararg method call
-    if (lstParameters.size() == descriptor.params.length && isVarArgCall()) {
+    if (lstParameters.size() == descriptor.params.length && isVarArgCall() && !lstParameters.isEmpty()) {
       Exprent lastParam = lstParameters.get(lstParameters.size() - 1);
       if (lastParam instanceof NewExprent && lastParam.getExprType().arrayDim >= 1) {
         ((NewExprent) lastParam).setVarArgParam(true);

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -665,7 +665,7 @@ private void setLambdaGenericTypes() {
               VarType curType = methodWrapper.varproc.getVarType(vpp);
               VarType infType = desc.getSignature().parameterTypes.get(j++).remap(tempMap);
 
-              if (infType != null && !infType.equals(VarType.VARTYPE_VOID)) {
+              if (infType != null && !infType.equals(VarType.VARTYPE_VOID) && curType != null) {
                 if (!curType.equals(infType) || (infType.isGeneric() && !((GenericType)infType).equalsExact(curType))) {
                   methodWrapper.varproc.setVarType(vpp, infType);
                   String paramName = methodWrapper.varproc.getVarName(vpp);

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -128,7 +128,7 @@ public VarNamesCollector getVarNamesCollector() {
     return varNamesCollector;
   }
 
-  public VarType getVarType(VarVersionPair pair) {
+  public @Nullable VarType getVarType(VarVersionPair pair) {
     return varVersions == null ? null : varVersions.getVarType(pair);
   }