Skip to content

[fix](audit) fix potential NPE when auditing #51620

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
morningman merged 1 commit into from
Jun 11, 2025
Merged

[fix](audit) fix potential NPE when auditing #51620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ...e-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilderForEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,10 @@ public LogicalPlan visitCreateTable(DorisParser.CreateTableContext ctx) {
@Override
public LogicalPlan visitTableValuedFunction(DorisParser.TableValuedFunctionContext ctx) {
DorisParser.PropertyItemListContext properties = ctx.properties;
encryptProperty(visitPropertyItemList(properties), properties.start.getStartIndex(),
properties.stop.getStopIndex());
if (properties != null) {
encryptProperty(visitPropertyItemList(properties), properties.start.getStartIndex(),
properties.stop.getStopIndex());
}
return super.visitTableValuedFunction(ctx);
}

Expand Down
3 changes: 2 additions & 1 deletion ...-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ public StmtType stmtType() {

@Override
public boolean needAuditEncryption() {
return !createTableInfo.getEngineName().equalsIgnoreCase(CreateTableInfo.ENGINE_OLAP);
// ATTN: createTableInfo.getEngineName() may be null
return !CreateTableInfo.ENGINE_OLAP.equalsIgnoreCase(createTableInfo.getEngineName());
}
}

Loading