Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #70850 from bruvzg/ts_tsafe_free

Browse Source 
[TextServer] Make `free` calls thread safe.
This commit is contained in:
Rémi Verschelde 2023-01-03 13:53:58 +01:00 committed by GitHub
commit 96f12040c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/text_server_adv/text_server_adv.cpp
View File

@ -385,11 +385,17 @@ void TextServerAdvanced::_free_rid(const RID &p_rid) {
_THREAD_SAFE_METHOD_
if (font_owner.owns(p_rid)) {
FontAdvanced *fd = font_owner.get_or_null(p_rid);
font_owner.free(p_rid);
{
MutexLock lock(fd->mutex);
font_owner.free(p_rid);
}
memdelete(fd);
} else if (shaped_owner.owns(p_rid)) {
ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_rid);
shaped_owner.free(p_rid);
{
MutexLock lock(sd->mutex);
shaped_owner.free(p_rid);
}
memdelete(sd);
}
}

10
modules/text_server_fb/text_server_fb.cpp
View File

@ -115,11 +115,17 @@ void TextServerFallback::_free_rid(const RID &p_rid) {
_THREAD_SAFE_METHOD_
if (font_owner.owns(p_rid)) {
FontFallback *fd = font_owner.get_or_null(p_rid);
font_owner.free(p_rid);
{
MutexLock lock(fd->mutex);
font_owner.free(p_rid);
}
memdelete(fd);
} else if (shaped_owner.owns(p_rid)) {
ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_rid);
shaped_owner.free(p_rid);
{
MutexLock lock(sd->mutex);
shaped_owner.free(p_rid);
}
memdelete(sd);
}
}