LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "idegen: Handle symbolic link that targets to current or parent directory" am: d6c9ae2806

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2203929

Change-Id: I539afd4eaa4a467e509433109856749c6f82c5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-30 06:42:13 +00:00
committed by Automerger Merge Worker
parent 4384b4cdd0 d6c9ae2806
commit e78fac030c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/idegen/src/Configuration.java
View File

@@ -18,6 +18,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@@ -153,6 +155,17 @@ public class Configuration {
continue; continue;
} }
if (Files.isSymbolicLink(file.toPath())) {
Path target = Files.readSymbolicLink(file.toPath()).normalize();
if (target.startsWith("") || target.startsWith(".")
|| target.startsWith("..")) {
// Don't recurse symbolic link that targets to parent
// or current directory.
Log.debug("Skipped: " + path);
continue;
}
}
if (file.isDirectory()) { if (file.isDirectory()) {
// Traverse nested directories. // Traverse nested directories.
if (excludes.exclude(path)) { if (excludes.exclude(path)) {
@@ -216,8 +229,7 @@ public class Configuration {
* found. * found.
*/ */
private static String parsePackageName(File file) throws IOException { private static String parsePackageName(File file) throws IOException {
BufferedReader in = new BufferedReader(new FileReader(file)); try (BufferedReader in = new BufferedReader(new FileReader(file))) {
try {
String line; String line;
while ((line = in.readLine()) != null) { while ((line = in.readLine()) != null) {
String trimmed = line.trim(); String trimmed = line.trim();
@@ -230,8 +242,6 @@ public class Configuration {
} }
return null; return null;
} finally {
in.close();
} }
} }