fix: Creation of directories with absolute path on Windows (#289)

getsentry · Jun 10, 2020 · 19ad6e7 · 19ad6e7
1 parent 3030613
commit 19ad6e7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/path/sentry_path_windows.c b/src/path/sentry_path_windows.c
@@ -362,7 +362,7 @@ sentry__path_create_dir_all(const sentry_path_t *path)
     memcpy(p, path->path, len * sizeof(wchar_t));
 
     for (ptr = p; *ptr; ptr++) {
-        if ((*ptr == L'\\' || *ptr == L'/') && ptr != p) {
+        if ((*ptr == L'\\' || *ptr == L'/') && ptr != p && ptr[-1] != L':') {
             *ptr = 0;
             _TRY_MAKE_DIR;
             *ptr = L'\\';

diff --git a/tests/unit/test_path.c b/tests/unit/test_path.c
@@ -151,8 +151,17 @@ SENTRY_TEST(path_directory)
     sentry_path_t *path_2 = sentry__path_from_str("foo/bar");
 #ifdef SENTRY_PLATFORM_WINDOWS
     sentry_path_t *path_3 = sentry__path_from_str("foo/bar\\baz");
+
+    // %TEMP%\\sentry_test_unit\\ 
+    wchar_t temp_folder[MAX_PATH];
+    GetEnvironmentVariableW(L"TEMP", temp_folder, sizeof(temp_folder));
+    sentry_path_t *path_4 = sentry__path_from_wstr(temp_folder);
+    path_4 = sentry__path_join_str(path_4, "sentry_test_unit");
 #endif
 
+    // cleanup before tests
+    sentry__path_remove_all(path_1);
+
     // create single directory
     sentry__path_create_dir_all(path_1);
     TEST_CHECK(sentry__path_is_dir(path_1));
@@ -167,14 +176,22 @@ SENTRY_TEST(path_directory)
     sentry__path_remove_all(path_2);
     TEST_CHECK(!sentry__path_is_dir(path_2));
 
-    // create directories by path with forward slash and backward slashes
 #ifdef SENTRY_PLATFORM_WINDOWS
+    // create directories by path with forward slash and backward slashes
     sentry__path_create_dir_all(path_3);
     TEST_CHECK(sentry__path_is_dir(path_3));
 
     sentry__path_remove_all(path_3);
     TEST_CHECK(!sentry__path_is_dir(path_3));
     sentry__path_free(path_3);
+
+    // create directories with absolute path
+    sentry__path_create_dir_all(path_4);
+    TEST_CHECK(sentry__path_is_dir(path_4));
+
+    sentry__path_remove_all(path_4);
+    TEST_CHECK(!sentry__path_is_dir(path_4));
+    sentry__path_free(path_4);
 #endif
 
     sentry__path_free(path_1);