fix: skip files that attempt to break filesystem (#3238)

iBotPeaches · Jul 30, 2023 · 81d6040 · 81d6040
1 parent 6630888
commit 81d6040
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/brut.j.dir/src/main/java/brut/directory/DirUtil.java b/brut.j.dir/src/main/java/brut/directory/DirUtil.java
@@ -23,6 +23,7 @@
 import brut.util.BrutIO;
 import brut.util.OS;
 import java.io.*;
+import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import java.util.logging.Logger;
 
@@ -96,9 +97,11 @@ public static void copyToDir(Directory in, File out, String fileName)
                     BrutIO.copyAndClose(in.getFileInput(fileName), Files.newOutputStream(outFile.toPath()));
                 }
             }
-        } catch (RootUnknownFileException | InvalidUnknownFileException | TraversalUnknownFileException exception) {
+        } catch (FileSystemException exception) {
+            LOGGER.warning(String.format("Skipping file %s (%s)", fileName, exception.getReason()));
+        } catch (RootUnknownFileException | InvalidUnknownFileException | TraversalUnknownFileException | IOException exception) {
             LOGGER.warning(String.format("Skipping file %s (%s)", fileName, exception.getMessage()));
-        } catch (IOException | BrutException ex) {
+        } catch (BrutException ex) {
             throw new DirectoryException("Error copying file: " + fileName, ex);
         }
     }