Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NPE #1020

Merged
merged 2 commits into from Feb 20, 2020
Merged

Fix NPE #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb520c
fix a possible NPE in the AbstractMatcher
poseidon-mysugr Feb 11, 2020
ee49142
add a test for empty instructions on AbstractMatcher.firstIsALoadd0
poseidon-mysugr Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AbstractMatcherTest.java
View file
Open in desktop
Expand Up @@ -202,6 +202,10 @@ public void nextIsType() {

@Test
public void firstIsALoad0() {
// should set cursor to null when no opcodes are present
matcher.firstIsALoad0(m);
assertNull(matcher.cursor);

// should set cursor to null when opcode mismatch
m.visitInsn(Opcodes.NOP);
matcher.firstIsALoad0(m);
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/AbstractMatcher.java
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ abstract class AbstractMatcher {
final void firstIsALoad0(final MethodNode methodNode) {
cursor = methodNode.instructions.getFirst();
skipNonOpcodes();
if (cursor.getOpcode() == Opcodes.ALOAD
if (cursor != null && cursor.getOpcode() == Opcodes.ALOAD
&& ((VarInsnNode) cursor).var == 0) {
return;
}
Expand Down