Skip to content

8341735: Rewrite the build/AbsPathsInImage.java test to not load the entire file at once #26030

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

8341735: Rewrite the build/AbsPathsInImage.java test to not load the entire file at once #26030

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3880b23
fix
cost0much Jun 27, 2025
396f36c
remove trailing whitespace
cost0much Jun 27, 2025
5d880ec
remove 8341024
cost0much Jun 27, 2025
eb63b16
style improvements
cost0much Jul 8, 2025
ef391ba
redid byte matching which should fix cross chunk strings
cost0much Jul 9, 2025
c3d7a77
Merge branch 'openjdk:master' into 8341735
cost0much Jul 9, 2025
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
32 changes: 22 additions & 10 deletions test/jdk/build/AbsPathsInImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* @requires !vm.debug
* @comment ASAN keeps the 'unwanted' paths in the binaries because of its build options
* @requires !vm.asan
* @run main/othervm -Xmx900m AbsPathsInImage
* @run main AbsPathsInImage
*/
public class AbsPathsInImage {

Expand Down Expand Up @@ -180,7 +180,14 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
}

private void scanFile(Path file, List<byte[]> searchPatterns) throws IOException {
List<String> matches = scanBytes(Files.readAllBytes(file), searchPatterns);
int bytesRead;
byte[] buffer = new byte[8192];
List<String> matches = new ArrayList<>();
try(InputStream inputStream = Files.newInputStream(file)) {
while((bytesRead = inputStream.read(buffer)) != -1) {
matches.addAll(scanBytes(buffer, bytesRead, searchPatterns));
}
}
if (matches.size() > 0) {
matchFound = true;
System.out.println(file + ":");
Expand All @@ -192,10 +199,15 @@ private void scanFile(Path file, List<byte[]> searchPatterns) throws IOException
}

private void scanZipFile(Path zipFile, List<byte[]> searchPatterns) throws IOException {
ZipEntry zipEntry;
int bytesRead;
byte[] buffer = new byte[8192];
try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(zipFile))) {
ZipEntry zipEntry;
while ((zipEntry = zipInputStream.getNextEntry()) != null) {
List<String> matches = scanBytes(zipInputStream.readAllBytes(), searchPatterns);
List<String> matches = new ArrayList<>();
while((bytesRead = zipInputStream.read(buffer)) != -1) {
matches.addAll(scanBytes(buffer, bytesRead, searchPatterns));
}
if (matches.size() > 0) {
matchFound = true;
System.out.println(zipFile + ", " + zipEntry.getName() + ":");
Expand All @@ -208,19 +220,19 @@ private void scanZipFile(Path zipFile, List<byte[]> searchPatterns) throws IOExc
}
}

private List<String> scanBytes(byte[] data, List<byte[]> searchPatterns) {
private List<String> scanBytes(byte[] data, int dataLength, List<byte[]> searchPatterns) {
List<String> matches = new ArrayList<>();
for (int i = 0; i < data.length; i++) {
for (int i = 0; i < dataLength; i++) {
for (byte[] searchPattern : searchPatterns) {
boolean found = true;
for (int j = 0; j < searchPattern.length; j++) {
if ((i + j >= data.length || data[i + j] != searchPattern[j])) {
if ((i + j >= dataLength || data[i + j] != searchPattern[j])) {
found = false;
break;
}
}
if (found) {
matches.add(new String(data, charsStart(data, i), charsOffset(data, i, searchPattern.length)));
matches.add(new String(data, charsStart(data, i), charsOffset(data, dataLength, i, searchPattern.length)));
// No need to search the same string for multiple patterns
break;
}
Expand All @@ -240,9 +252,9 @@ private int charsStart(byte[] data, int startIndex) {
return index + 1;
}

private int charsOffset(byte[] data, int startIndex, int startOffset) {
private int charsOffset(byte[] data, int dataLength, int startIndex, int startOffset) {
int offset = startOffset;
while (startIndex + ++offset < data.length) {
while (startIndex + ++offset < dataLength) {
byte datum = data[startIndex + offset];
if (datum < 32 || datum > 126) {
break;
Expand Down