griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ghost: Make special user directory query thread safe

Browse Source 
Similar to e0ff7731e0.

Noticed a data race when working on blender/blender!130543, which calls
this function from a thread. Make this thread safe by avoiding returning
of static memory, instead use an optional `std::string`.

Pull Request: https://projects.blender.org/blender/blender/pulls/141083
This commit is contained in:
Julian Eisel
2025-06-27 15:16:35 +02:00
committed by Julian Eisel
parent 52caedb19e
commit 4b2d60a2c3
10 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/blenkernel/intern/appdir.cc
View File

@@ -168,11 +168,12 @@ bool BKE_appdir_folder_documents(char *dir)
{
dir[0] = '\0';
const char *documents_path = GHOST_getUserSpecialDir(GHOST_kUserSpecialDirDocuments);
const std::optional<std::string> documents_path = GHOST_getUserSpecialDir(
GHOST_kUserSpecialDirDocuments);
/* Usual case: Ghost gave us the documents path. We're done here. */
if (documents_path && BLI_is_dir(documents_path)) {
BLI_strncpy(dir, documents_path, FILE_MAXDIR);
if (documents_path && BLI_is_dir(documents_path->c_str())) {
BLI_strncpy(dir, documents_path->c_str(), FILE_MAXDIR);
return true;
}
@@ -198,21 +199,27 @@ bool BKE_appdir_folder_caches(char *path, const size_t path_maxncpy)
{
path[0] = '\0';
const char *caches_root_path = GHOST_getUserSpecialDir(GHOST_kUserSpecialDirCaches);
if (caches_root_path == nullptr || !BLI_is_dir(caches_root_path)) {
std::optional<std::string> caches_root_path = GHOST_getUserSpecialDir(
GHOST_kUserSpecialDirCaches);
if (!caches_root_path || !BLI_is_dir(caches_root_path->c_str())) {
caches_root_path = BKE_tempdir_base();
}
if (caches_root_path == nullptr || !BLI_is_dir(caches_root_path)) {
if (!caches_root_path || !BLI_is_dir(caches_root_path->c_str())) {
return false;
}
#ifdef WIN32
BLI_path_join(
path, path_maxncpy, caches_root_path, "Blender Foundation", "Blender", "Cache", SEP_STR);
BLI_path_join(path,
path_maxncpy,
caches_root_path->c_str(),
"Blender Foundation",
"Blender",
"Cache",
SEP_STR);
#elif defined(__APPLE__)
BLI_path_join(path, path_maxncpy, caches_root_path, "Blender", SEP_STR);
BLI_path_join(path, path_maxncpy, caches_root_path->c_str(), "Blender", SEP_STR);
#else /* __linux__ */
BLI_path_join(path, path_maxncpy, caches_root_path, "blender", SEP_STR);
BLI_path_join(path, path_maxncpy, caches_root_path->c_str(), "blender", SEP_STR);
#endif
return true;