fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 10:45:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

deleteFolder(): check if passed argument is a symlink

Browse Source 
Prevents possible data loss when user replaced directory '~/storage' with
a symlink.
This commit is contained in:
Leonid Plyushch
2018-06-29 14:43:38 +03:00
committed by Fredrik Fornwall
parent d1f0c76db3
commit b7864d6ac2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/termux/app/TermuxInstaller.java
View File

@@ -209,18 +209,18 @@ final class TermuxInstaller {
Arrays.toString(Build.SUPPORTED_ABIS)); Arrays.toString(Build.SUPPORTED_ABIS));
} }
/** Delete a folder and all its content or throw. */ /** Delete a folder and all its content or throw. Don't follow symlinks. */
static void deleteFolder(File fileOrDirectory) throws IOException { static void deleteFolder(File fileOrDirectory) throws IOException {
File[] children = fileOrDirectory.listFiles(); if (fileOrDirectory.getCanonicalPath().equals(fileOrDirectory.getAbsolutePath()) && fileOrDirectory.isDirectory()) {
if (children != null) { File[] children = fileOrDirectory.listFiles();
for (File child : children) {
if (child.getCanonicalFile().equals(child.getAbsoluteFile())) { if (children != null) {
for (File child : children) {
deleteFolder(child); deleteFolder(child);
} else {
child.delete();
} }
} }
} }
if (!fileOrDirectory.delete()) { if (!fileOrDirectory.delete()) {
throw new RuntimeException("Unable to delete " + (fileOrDirectory.isDirectory() ? "directory " : "file ") + fileOrDirectory.getAbsolutePath()); throw new RuntimeException("Unable to delete " + (fileOrDirectory.isDirectory() ? "directory " : "file ") + fileOrDirectory.getAbsolutePath());
} }