Skip to content

review: fix: handle null bodies of while statements. #4813

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

Merged
merged 2 commits into from
Aug 6, 2022
Merged

review: fix: handle null bodies of while statements. #4813

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
944a71a
fix NPE in control flow builder
MartinWitt Jul 26, 2022
b7958fd
readd newline
MartinWitt Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion spoon-control-flow/src/main/java/fr/inria/controlflow/ControlFlowBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,9 @@ public void visitCtWhile(CtWhile whileLoop) {
tryAddEdge(lastNode, branch);
tryAddEdge(branch, convergenceNode);
lastNode = branch;
whileLoop.getBody().accept(this);
if (whileLoop.getBody() != null) {
whileLoop.getBody().accept(this);
}
tryAddEdge(lastNode, branch, true, false);
lastNode = convergenceNode;

Expand Down
11 changes: 11 additions & 0 deletions spoon-control-flow/src/test/java/fr/inria/controlflow/ControlFlowGraphTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@
package fr.inria.controlflow;

import org.junit.jupiter.api.Test;
import spoon.Launcher;
import spoon.reflect.code.CtStatement;
import spoon.reflect.declaration.CtElement;
import spoon.support.reflect.code.CtIfImpl;
import static fr.inria.controlflow.BranchKind.*;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

Expand Down Expand Up @@ -169,4 +172,12 @@ public void testCounting() {
assertEquals(3, graph.statementCount());
}

@Test
void issue4803() {
// contract: analyzing while(true); should not throw a NPE. See issue 4803
ControlFlowBuilder builder = new ControlFlowBuilder();
Launcher launcher = new Launcher();
CtElement element = launcher.getFactory().createCodeSnippetStatement("while(true)").compile();
assertDoesNotThrow(() -> builder.build(element));
}
}