phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[java] Fix NPE in UseTryWithResources

Browse Source
This commit is contained in:
Andreas Dangel
2021-07-10 10:46:31 +02:00
parent 01a9c0fa99
commit ec27419235
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseTryWithResourcesRule.java
View File

@ -14,6 +14,8 @@ import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.lang.java.ast.ASTArguments; import net.sourceforge.pmd.lang.java.ast.ASTArguments;
import net.sourceforge.pmd.lang.java.ast.ASTFinallyStatement; import net.sourceforge.pmd.lang.java.ast.ASTFinallyStatement;
import net.sourceforge.pmd.lang.java.ast.ASTName; import net.sourceforge.pmd.lang.java.ast.ASTName;
import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix;
import net.sourceforge.pmd.lang.java.ast.ASTTryStatement; import net.sourceforge.pmd.lang.java.ast.ASTTryStatement;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId; import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
@ -105,10 +107,15 @@ public final class UseTryWithResourcesRule extends AbstractJavaRule {
if (lastDot > -1) { if (lastDot > -1) {
image = image.substring(lastDot + 1); image = image.substring(lastDot + 1);
} }
if (getProperty(CLOSE_METHODS).contains(image)) { if (getProperty(CLOSE_METHODS).contains(image) && isMethodCall(name)) {
potentialCloses.add(name); potentialCloses.add(name);
} }
} }
return potentialCloses; return potentialCloses;
} }
private boolean isMethodCall(ASTName potentialMethodCall) {
return potentialMethodCall.getNthParent(2) instanceof ASTPrimaryExpression
&& !potentialMethodCall.getNthParent(2).findChildrenOfType(ASTPrimarySuffix.class).isEmpty();
}
} }

21
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UseTryWithResources.xml
View File

@ -308,4 +308,25 @@ class Holder implements AutoCloseable {
<code-ref id="issue-3235-with-local-var"/> <code-ref id="issue-3235-with-local-var"/>
</test-code> </test-code>
<test-code>
<description>NPE when determining closeTarget</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>6</expected-linenumbers>
<code><![CDATA[
import java.io.InputStream;
import java.io.IOException;
public class UseTryWithResources {
public void read(InputStream is, boolean close) throws IOException {
try {
is.read();
} finally {
if (close) {
is.close();
}
}
}
}
]]></code>
</test-code>
</test-data> </test-data>