Merge branch 'sw/safe-create-leading-dir-race'

* sw/safe-create-leading-dir-race: safe_create_leading_directories: fix race that could give a false negative
git-mirror · Apr 2, 2013 · 37ba4c6 · 37ba4c6
2 parents c5f05b2 + 928734d
commit 37ba4c6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/sha1_file.c b/sha1_file.c
@@ -124,8 +124,13 @@ int safe_create_leading_directories(char *path)
 			}
 		}
 		else if (mkdir(path, 0777)) {
-			*pos = '/';
-			return -1;
+			if (errno == EEXIST &&
+			    !stat(path, &st) && S_ISDIR(st.st_mode)) {
+				; /* somebody created it since we checked */
+			} else {
+				*pos = '/';
+				return -1;
+			}
 		}
 		else if (adjust_shared_perm(path)) {
 			*pos = '/';