From ed104f40d23c6ed8101b80cacb52e0b368ad6136 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 3 Nov 2015 11:03:36 +0100 Subject: [PATCH] EA-75099 (AIOOBE: MethodCallUtils.findMethodWithReplacedArgument) --- .../src/com/siyeh/ig/psiutils/MethodCallUtils.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java index 1de04ea6af3a..f5fda1767549 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java @@ -209,10 +209,13 @@ public class MethodCallUtils { return variable.equals(element); } + @Nullable public static PsiMethod findMethodWithReplacedArgument(@NotNull PsiCall call, @NotNull PsiExpression target, @NotNull PsiExpression replacement) { final PsiExpressionList argumentList = call.getArgumentList(); - assert argumentList != null; + if (argumentList == null) { + return null; + } final PsiExpression[] expressions = argumentList.getExpressions(); int index = -1; for (int i = 0; i < expressions.length; i++) { @@ -221,7 +224,9 @@ public class MethodCallUtils { index = i; } } - assert index >= 0; + if (index < 0) { + return null; + } final PsiCall copy = (PsiCall)call.copy(); final PsiExpressionList copyArgumentList = copy.getArgumentList(); assert copyArgumentList != null;