commit 58cef1268241036356e72b5452760a51ec8ab2b5
author Stefan Bodewig <bodewig@apache.org> Tue May 08 05:56:58 2018 +0200
committer Stefan Bodewig <bodewig@apache.org> Tue May 08 05:56:58 2018 +0200
tree 5d5d77428c2d2cb7bf9d790f13655443ac3532f8
parent 7a10230e1ecbb0f642eb2352a7f85f00961a6d54

better check result of mkdirs

src/main/java/org/apache/commons/compress/archivers/examples/Expander.java

diff --git a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
index c4d036c..f6bee61 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
@@ -246,9 +246,14 @@
                     + " would craete file outside of " + targetDirectory);
             }
             if (nextEntry.isDirectory()) {
-                f.mkdirs();
+                if (!f.isDirectory() && !f.mkdirs()) {
+                    throw new IOException("failed to create directory " + f);
+                }
             } else {
-                f.getParentFile().mkdirs();
+                File parent = f.getParentFile();
+                if (!parent.isDirectory() && !parent.mkdirs()) {
+                    throw new IOException("failed to create directory " + parent);
+                }
                 try (OutputStream o = Files.newOutputStream(f.toPath())) {
                     writer.writeEntryDataTo(nextEntry, o);
                 }

src/site/xdoc/examples.xml

diff --git a/src/site/xdoc/examples.xml b/src/site/xdoc/examples.xml
index ec6ced7..11e6009 100644
--- a/src/site/xdoc/examples.xml
+++ b/src/site/xdoc/examples.xml
@@ -164,9 +164,14 @@
         String name = fileName(targetDir, entry);
         File f = new File(name);
         if (entry.isDirectory()) {
-            f.mkdirs();
+            if (!f.isDirectory() && !f.mkdirs()) {
+                throw new IOException("failed to create directory " + f);
+            }
         } else {
-            f.getParentFile().mkdirs();
+            File parent = f.getParentFile();
+            if (!parent.isDirectory() && !parent.mkdirs()) {
+                throw new IOException("failed to create directory " + parent);
+            }
             try (OutputStream o = Files.newOutputStream(f.toPath())) {
                 IOUtils.copy(i, o);
             }