Thanks to visit codestin.com
Credit goes to github.com

Skip to content

🍒 9355 - Fix NullPointerException log in AppSec #9356

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 1 commit into from
Aug 12, 2025
Merged

🍒 9355 - Fix NullPointerException log in AppSec #9356

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
Fix NullPointerException log in AppSec (#9355) 
What Does This Do
Modifies WafModule#buildEvents to safely handle actionWithData.data being null.

Motivation
Fix #9346

Additional Notes
The current version of libddwaf may return null in the data field of actionWithData. This was previously not handled and could cause unexpected logged exceptions. The method now explicitly checks for null to prevent this.

(cherry picked from commit ef2e9f0)
  • Loading branch information
@jandro996
jandro996 committed Aug 12, 2025
commit 1e4b598bd3020e69ebabea030f5b2f22135a56ae
5 changes: 5 additions & 0 deletions dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.datadog.appsec.ddwaf;

import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
import static datadog.trace.util.stacktrace.StackTraceEvent.DEFAULT_LANGUAGE;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down Expand Up @@ -557,6 +558,10 @@ private Waf.ResultWithData runWafTransient(
}

private Collection<AppSecEvent> buildEvents(Waf.ResultWithData actionWithData) {
if (actionWithData.data == null) {
log.debug(SEND_TELEMETRY, "WAF result data is null");
return Collections.emptyList();
}
Collection<WAFResultData> listResults;
try {
listResults = RES_JSON_ADAPTER.fromJson(actionWithData.data);
Expand Down
13 changes: 13 additions & 0 deletions dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,19 @@ class WAFModuleSpecification extends DDSpecification {
internal == libddwaf
}

void 'ResultWithData - null data'() {
def waf = new WAFModule()
Waf.ResultWithData rwd = new Waf.ResultWithData(null, null, null, null)
Collection ret

when:
ret = waf.buildEvents(rwd)

then:
noExceptionThrown()
ret.isEmpty()
}

/**
* Helper to return a concrete Waf exception for each WafErrorCode
*/
Expand Down