From 4f2893b299108e0f4d705ee17667476db6b02ab6 Mon Sep 17 00:00:00 2001 From: XenoAmess Date: Sun, 10 Oct 2021 08:28:11 +0800 Subject: [PATCH 1/2] NPE in SchemaStatVisitor --- .../com/alibaba/druid/sql/visitor/SchemaStatVisitor.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 4009930b79..6cb3145022 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -3188,10 +3188,9 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { SQLExprTableSource table = x.getTable(); if (table != null) { table.accept(this); - } - - for (SQLName column : x.getColumns()) { - addColumn(table.getName(), column.getSimpleName()); + for (SQLName column : x.getColumns()) { + addColumn(table.getName(), column.getSimpleName()); + } } return false; From 94f324913418744eacefe0cd83d140645b85c787 Mon Sep 17 00:00:00 2001 From: XenoAmess Date: Sun, 10 Oct 2021 08:49:25 +0800 Subject: [PATCH 2/2] NPE in SQLShowGrantsStatement --- .../alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java index fabb110f87..0ffeae9469 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java @@ -47,7 +47,7 @@ public class SQLShowGrantsStatement extends SQLStatementImpl implements SQLShowS } public void setOn(SQLExpr x) { - if (x == null) { + if (x != null) { x.setParent(this); } this.on = x;