Skip to content

Add safety check for TargetSystem encoding limits #10451

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
amarziali merged 1 commit into from
Jan 27, 2026
+8 −0
Merged

Add safety check for TargetSystem encoding limits #10451

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
8 changes: 8 additions & 0 deletions dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,14 @@ static boolean decodeModuleHasTargetSystemOverrides(byte flags) {
}

static short encodeTargetSystems(Set<InstrumenterModule.TargetSystem> targetSystems) {
final int allTargetSystemsCount = InstrumenterModule.TargetSystem.values().length;
// Safety check to ensure we don’t overflow the index if additional TargetSystem enums are added
if (allTargetSystemsCount > 16) {
throw new IllegalStateException(
"Using a short will only allow encoding 16 different target systems, but found "
+ allTargetSystemsCount
+ ". Please use a larger data type for encoding/decoding this field.");
}
short ret = 0;
for (InstrumenterModule.TargetSystem ts : targetSystems) {
ret |= (short) (1 << ts.ordinal());
Expand Down