fixing NPE in PercentEscaper

mhlidd · mhlidd · commit 6ea9bb2beed3 · 2025-06-27T11:18:43.000-04:00
(cherry picked from commit 7f6f769)
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java b/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java
@@ -237,7 +237,7 @@ private static Escaped escapeSlow(String s, int index, boolean[] unsafeOctets) {
   private static int nextEscapeIndex(CharSequence csq, int index, int end, boolean[] unsafeOctets) {
     for (; index < end; index++) {
       char c = csq.charAt(index);
-      if (c <= unsafeOctets.length && unsafeOctets[c]) {
+      if (c < unsafeOctets.length && unsafeOctets[c]) {
         break;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ private static Escaped escapeSlow(String s, int index, boolean[] unsafeOctets) {`
`237`	`237`	`private static int nextEscapeIndex(CharSequence csq, int index, int end, boolean[] unsafeOctets) {`
`238`	`238`	`for (; index < end; index++) {`
`239`	`239`	`char c = csq.charAt(index);`
`240`		`- if (c <= unsafeOctets.length && unsafeOctets[c]) {`
	`240`	`+ if (c < unsafeOctets.length && unsafeOctets[c]) {`
`241`	`241`	`break;`
`242`	`242`	`}`
`243`	`243`	`}`