[FM] Properly sanitise the relative paths

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>
MuntashirAkon · Aug 25, 2023 · 0df32f8 · 0df32f8
1 parent 34488a9
commit 0df32f8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/fm/FmFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/fm/FmFragment.java
@@ -595,7 +595,7 @@ private void goToRawPath(@NonNull String p) {
         }
         // Relative path
         String goodPath = Paths.sanitize(p, false);
-        if (goodPath == null) {
+        if (goodPath == null || goodPath.equals(File.separator)) {
             // No relative path means current path which is already loaded
             return;
         }
@@ -604,7 +604,7 @@ private void goToRawPath(@NonNull String p) {
             List<String> pathSegments = currentUri.getPathSegments();
             if (pathSegments.size() == 4) {
                 // For a tree URI, the 3rd index is the path
-                String lastPathSegment = pathSegments.get(3) + File.separator + p;
+                String lastPathSegment = pathSegments.get(3) + File.separator + goodPath;
                 Uri.Builder b = new Uri.Builder()
                         .scheme(currentUri.getScheme())
                         .authority(currentUri.getAuthority())
@@ -619,7 +619,7 @@ private void goToRawPath(@NonNull String p) {
         }
         // For others, simply append path segments at the end
         @SuppressWarnings("SuspiciousRegexArgument") // We aren't on Windows
-        String[] segments = p.split(File.separator);
+        String[] segments = goodPath.split(File.separator);
         Uri.Builder b = currentUri.buildUpon();
         for (String segment : segments) {
             b.appendPath(segment);