PDFBOX-5660: avoid default encoding

THausherr · THausherr · commit 15e3c5f6aa2b · 2025-07-11T10:14:53.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1927130 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
@@ -18,6 +18,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
@@ -366,7 +367,7 @@ else if (startOpIdx != -1 && endOpIdx == -1 &&
             {
                 // usually, the operator here is Q, sometimes EMC (PDFBOX-2376), S (PDFBOX-3784),
                 // or a number (PDFBOX-5957)
-                s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx);
+                s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx, StandardCharsets.US_ASCII);
                 if (!"Q".equals(s) && !"EMC".equals(s) && !"S".equals(s) &&
                     !s.matches("^\\d*\\.?\\d*$"))
                 {
@@ -381,7 +382,7 @@ else if (startOpIdx != -1 && endOpIdx == -1 &&
                 if (endOpIdx == -1)
                 {
                     endOpIdx = MAX_BIN_CHAR_TEST_LENGTH;
-                    s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx);
+                    s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx, StandardCharsets.US_ASCII);
                 }
                 LOG.debug("startOpIdx: {} endOpIdx: {} s = '{}'", startOpIdx, endOpIdx, s);
                 // look for token of 3 chars max or a number

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`import java.io.ByteArrayOutputStream;`
`20`	`20`	`import java.io.IOException;`
	`21`	`+import java.nio.charset.StandardCharsets;`
`21`	`22`	`import java.util.ArrayList;`
`22`	`23`	`import java.util.List;`
`23`	`24`	`import org.apache.logging.log4j.Logger;`
`@@ -366,7 +367,7 @@ else if (startOpIdx != -1 && endOpIdx == -1 &&`
`366`	`367`	`{`
`367`	`368`	`// usually, the operator here is Q, sometimes EMC (PDFBOX-2376), S (PDFBOX-3784),`
`368`	`369`	`// or a number (PDFBOX-5957)`
`369`		`- s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx);`
	`370`	`+ s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx, StandardCharsets.US_ASCII);`
`370`	`371`	`if (!"Q".equals(s) && !"EMC".equals(s) && !"S".equals(s) &&`
`371`	`372`	`!s.matches("^\\d\\.?\\d$"))`
`372`	`373`	`{`
`@@ -381,7 +382,7 @@ else if (startOpIdx != -1 && endOpIdx == -1 &&`
`381`	`382`	`if (endOpIdx == -1)`
`382`	`383`	`{`
`383`	`384`	`endOpIdx = MAX_BIN_CHAR_TEST_LENGTH;`
`384`		`- s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx);`
	`385`	`+ s = new String(binCharTestArr, startOpIdx, endOpIdx - startOpIdx, StandardCharsets.US_ASCII);`
`385`	`386`	`}`
`386`	`387`	`LOG.debug("startOpIdx: {} endOpIdx: {} s = '{}'", startOpIdx, endOpIdx, s);`
`387`	`388`	`// look for token of 3 chars max or a number`