Author: tilman Date: Fri Jul 11 11:31:45 2025 New Revision: 1927133 URL: http://svn.apache.org/viewvc?rev=1927133&view=rev Log: PDFBOX-5660: avoid default encoding
Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1927133&r1=1927132&r2=1927133&view=diff ============================================================================== --- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original) +++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Fri Jul 11 11:31:45 2025 @@ -20,10 +20,11 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.net.URI; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -431,7 +432,8 @@ final class FileSystemFontProvider exten { File file = getDiskCacheFile(); - try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) + try (BufferedWriter writer = new BufferedWriter( + new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) { for (FSFontInfo fontInfo : fontInfoList) { @@ -533,7 +535,8 @@ final class FileSystemFontProvider exten if (fileExists) { - try (BufferedReader reader = new BufferedReader(new FileReader(diskCacheFile))) + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(new FileInputStream(diskCacheFile), StandardCharsets.UTF_8))) { // consequent lines usually share the same font file (e.g. "Courier", "Courier-Bold", "Courier-Oblique"). // unused if SKIP_CHECKSUMS