archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8309356: Read files in includedir in alphanumeric order

Browse source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2023-10-02 18:12:06 +00:00
parent a564d436c7
commit f985006142
2 changed files with 75 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.security.jgss/share/classes/sun/security/krb5/Config.java
View file

@ -31,7 +31,6 @@
package sun.security.krb5;
import java.io.*;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.Path;
@ -43,6 +42,7 @@ import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import jdk.internal.util.OperatingSystem;
import sun.net.dns.ResolverConfiguration;
@ -610,9 +610,8 @@ public class Config {
} else if (line.startsWith("includedir ")) {
Path dir = Paths.get(
line.substring("includedir ".length()).trim());
try (DirectoryStream<Path> files =
Files.newDirectoryStream(dir)) {
for (Path p: files) {
try (Stream<Path> files = Files.list(dir)) {
for (Path p: files.sorted().toList()) {
if (Files.isDirectory(p)) continue;
String name = p.getFileName().toString();
if (name.matches("[a-zA-Z0-9_-]+") ||