Skip to content

Painless: Fix For Loop NullPointerException #28506

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
Feb 5, 2018
Merged

Painless: Fix For Loop NullPointerException #28506

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
9201d63
Fixes a null pointer exception in certain cases of for loop usage in
jdconrad Feb 3, 2018
5f89a17
Merge branch 'master' into fixfor
jdconrad Feb 5, 2018
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
9 changes: 8 additions & 1 deletion modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void analyze(Locals locals) {
locals = Locals.newLocalScope(locals);

if (initializer != null) {
if (initializer instanceof AStatement) {
if (initializer instanceof SDeclBlock) {
initializer.analyze(locals);
} else if (initializer instanceof AExpression) {
AExpression initializer = (AExpression)this.initializer;
Expand All @@ -87,6 +87,9 @@ void analyze(Locals locals) {
if (!initializer.statement) {
throw createError(new IllegalArgumentException("Not a statement."));
}

initializer.expected = initializer.actual;
this.initializer = initializer.cast(locals);
} else {
throw createError(new IllegalStateException("Illegal tree structure."));
}
Expand Down Expand Up @@ -119,6 +122,9 @@ void analyze(Locals locals) {
if (!afterthought.statement) {
throw createError(new IllegalArgumentException("Not a statement."));
}

afterthought.expected = afterthought.actual;
afterthought = afterthought.cast(locals);
}

if (block != null) {
Expand Down Expand Up @@ -197,6 +203,7 @@ void write(MethodWriter writer, Globals globals) {
if (afterthought != null) {
writer.mark(begin);
afterthought.write(writer, globals);
writer.writePop(MethodWriter.getType(afterthought.expected).getSize());
}

if (afterthought != null || !allEscape) {
Expand Down
4 changes: 4 additions & 0 deletions modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicStatementTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,12 @@ public void testDoWhileStatement() {
}

public void testForStatement() {
assertEquals(6, exec("int x, y; for (x = 0; x < 4; ++x) {y += x;} return y;"));
assertEquals("aaaaaa", exec("String c = \"a\"; for (int x = 0; x < 5; ++x) c += \"a\"; return c;"));

assertEquals(6, exec("double test() { return 0.0; }" +
"int x, y; for (test(); x < 4; test()) {y += x; ++x;} return y;"));

Object value = exec(
" int[][] b = new int[5][5]; \n" +
" for (int x = 0; x < 5; ++x) { \n" +
Expand Down