'mkdir(...)' race condition

mambax7 · Apr 15, 2019 · 3c39c20 · 3c39c20
1 parent f5b5855
commit 3c39c20
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/admin/modify_ads.php b/admin/modify_ads.php
@@ -45,13 +45,19 @@ function index()
     $photo_thumb_dir   = $GLOBALS['xoopsModuleConfig']['adslight_path_upload'] . '/thumbs';
     $photo_resized_dir = $GLOBALS['xoopsModuleConfig']['adslight_path_upload'] . '/midsize';
     if (!is_dir($photo_dir)) {
-        mkdir($photo_dir);
+        if (!mkdir($photo_dir) && !is_dir($photo_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_dir));
+        }
     }
     if (!is_dir($photo_thumb_dir)) {
-        mkdir($photo_thumb_dir);
+        if (!mkdir($photo_thumb_dir) && !is_dir($photo_thumb_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_thumb_dir));
+        }
     }
     if (!is_dir($photo_resized_dir)) {
-        mkdir($photo_resized_dir);
+        if (!mkdir($photo_resized_dir) && !is_dir($photo_resized_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_resized_dir));
+        }
     }
     if (!is_writable($photo_dir) || !is_readable($photo_dir)) {
         echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_ADSLIGHT_CHECKER . '</legend><br>';

diff --git a/admin/validate_ads.php b/admin/validate_ads.php
@@ -47,13 +47,19 @@ function index()
     $photo_thumb_dir   = $GLOBALS['xoopsModuleConfig']['adslight_path_upload'] . '/thumbs';
     $photo_resized_dir = $GLOBALS['xoopsModuleConfig']['adslight_path_upload'] . '/midsize';
     if (!is_dir($photo_dir)) {
-        mkdir($photo_dir);
+        if (!mkdir($photo_dir) && !is_dir($photo_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_dir));
+        }
     }
     if (!is_dir($photo_thumb_dir)) {
-        mkdir($photo_thumb_dir);
+        if (!mkdir($photo_thumb_dir) && !is_dir($photo_thumb_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_thumb_dir));
+        }
     }
     if (!is_dir($photo_resized_dir)) {
-        mkdir($photo_resized_dir);
+        if (!mkdir($photo_resized_dir) && !is_dir($photo_resized_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_resized_dir));
+        }
     }
     if (!is_writable($photo_dir) || !is_readable($photo_dir)) {
         echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_ADSLIGHT_CHECKER . '</legend><br>';

diff --git a/admin/view_ads.php b/admin/view_ads.php
@@ -44,13 +44,19 @@ function index()
     $photo_thumb_dir   = $GLOBALS['xoopsModuleConfig']['adslight_path_upload'] . '/thumbs';
     $photo_resized_dir = $GLOBALS['xoopsModuleConfig']['adslight_path_upload'] . '/midsize';
     if (!is_dir($photo_dir)) {
-        mkdir($photo_dir);
+        if (!mkdir($photo_dir) && !is_dir($photo_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_dir));
+        }
     }
     if (!is_dir($photo_thumb_dir)) {
-        mkdir($photo_thumb_dir);
+        if (!mkdir($photo_thumb_dir) && !is_dir($photo_thumb_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_thumb_dir));
+        }
     }
     if (!is_dir($photo_resized_dir)) {
-        mkdir($photo_resized_dir);
+        if (!mkdir($photo_resized_dir) && !is_dir($photo_resized_dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $photo_resized_dir));
+        }
     }
     if (!is_writable($photo_dir) || !is_readable($photo_dir)) {
         echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_ADSLIGHT_CHECKER . '</legend><br>';