diff options
author | Haoyu Qiu <timothyqiu32@gmail.com> | 2022-09-30 09:32:44 +0800 |
---|---|---|
committer | Haoyu Qiu <timothyqiu32@gmail.com> | 2022-09-30 09:41:05 +0800 |
commit | d873c549a2aa23b5a05e3085f25cbcbb2bef2cfd (patch) | |
tree | 6590ef55eaa6bd45cf19eef1d6781ebc14eff991 /core/io | |
parent | 56563ef09e779b9f4b105fea0e5a1a8e59c7cfe8 (diff) |
Fix crash when executing `ResourceUID.set_id`
Diffstat (limited to 'core/io')
-rw-r--r-- | core/io/resource_uid.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/io/resource_uid.cpp b/core/io/resource_uid.cpp index 5324c5dd84..ed5ce3b911 100644 --- a/core/io/resource_uid.cpp +++ b/core/io/resource_uid.cpp @@ -113,7 +113,12 @@ void ResourceUID::set_id(ID p_id, const String &p_path) { MutexLock l(mutex); ERR_FAIL_COND(!unique_ids.has(p_id)); CharString cs = p_path.utf8(); - if (strcmp(cs.ptr(), unique_ids[p_id].cs.ptr()) != 0) { + const char *update_ptr = cs.ptr(); + const char *cached_ptr = unique_ids[p_id].cs.ptr(); + if (update_ptr == nullptr && cached_ptr == nullptr) { + return; // Both are empty strings. + } + if ((update_ptr == nullptr) != (cached_ptr == nullptr) || strcmp(update_ptr, cached_ptr) != 0) { unique_ids[p_id].cs = cs; unique_ids[p_id].saved_to_cache = false; //changed changed = true; |