godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when executing ResourceUID.set_id

Browse Source
This commit is contained in:
Haoyu Qiu 2022-09-30 09:32:44 +08:00
parent 56563ef09e
commit d873c549a2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/io/resource_uid.cpp
View File

@ -113,7 +113,12 @@ void ResourceUID::set_id(ID p_id, const String &p_path) {
MutexLock l(mutex); MutexLock l(mutex);
ERR_FAIL_COND(!unique_ids.has(p_id)); ERR_FAIL_COND(!unique_ids.has(p_id));
CharString cs = p_path.utf8(); 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].cs = cs;
unique_ids[p_id].saved_to_cache = false; //changed unique_ids[p_id].saved_to_cache = false; //changed
changed = true; changed = true;