FileSystem: fix mkdir race condition (#120)

nette · Sep 3, 2016 · 47dc563 · 47dc563
1 parent 3b239d7
commit 47dc563
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Utils/FileSystem.php b/src/Utils/FileSystem.php
@@ -24,8 +24,8 @@ class FileSystem
 	 */
 	public static function createDir($dir, $mode = 0777)
 	{
-		if (!is_dir($dir) && !@mkdir($dir, $mode, TRUE)) { // intentionally @; not atomic
-			throw new Nette\IOException("Unable to create directory '$dir'.");
+		if (!is_dir($dir) && !@mkdir($dir, $mode, TRUE) && !is_dir($dir)) { // @ - dir may already exist
+			throw new Nette\IOException("Unable to create directory '$dir'. " . error_get_last()['message']);
 		}
 	}
 

diff --git a/tests/Utils/FileSystem.phpt b/tests/Utils/FileSystem.phpt
@@ -21,7 +21,7 @@ test(function () { // createDir
 
 Assert::exception(function () {
 	FileSystem::createDir('');
-}, Nette\IOException::class, "Unable to create directory ''.");
+}, Nette\IOException::class, "Unable to create directory ''.%A%");
 
 
 test(function () { // write + read
@@ -32,7 +32,7 @@ test(function () { // write + read
 
 Assert::exception(function () {
 	FileSystem::write('', 'Hello');
-}, Nette\IOException::class, "Unable to create directory ''.");
+}, Nette\IOException::class, "Unable to create directory ''.%A%");
 
 Assert::exception(function () {
 	FileSystem::read('');