Don't reuse the same list for _get_property_list()#1904
Merged
akien-mga merged 1 commit intogodotengine:masterfrom Jan 20, 2026
Merged
Don't reuse the same list for _get_property_list()#1904akien-mga merged 1 commit intogodotengine:masterfrom
_get_property_list()#1904akien-mga merged 1 commit intogodotengine:masterfrom
Conversation
dsnopek
force-pushed
the
dont-reuse-plist
branch
from
1650c3f to
6d69a62
Compare
bruvzg
approved these changes
Jan 20, 2026
Member
bruvzg
left a comment
bruvzg
left a comment
There was a problem hiding this comment.
Fixes the issue, code looks good.
akien-mga
approved these changes
Jan 20, 2026
Member
|
Thanks! |
This was referenced Jan 23, 2026
Zylann
added a commit
to Zylann/cpp_bindings
that referenced
this pull request
Feb 16, 2026
dsnopek
added a commit
that referenced
this pull request
Feb 16, 2026
Cherry-pick #1904: fix _get_property_list failing in thread scenarios
Collaborator
Author
|
Cherry-picked for |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In order to work around an issue where we need to keep the
List<PropertyInfo>for_get_property_list()alive until the data it contains isn't needed anymore, we've been reusing the sameList<PropertyInfo>.This works fine in a single-threaded scenario, but when multiple threads are involved, they'll stomp all over the list at the same time.
This PR makes it so that we aren't reusing the same
List<PropertyInfo>, but instead, allocating a new one each time.The tricky part is that we need to hang onto a pointer to it, so that we can free it when we're done. However, Godot will only pass us the
GDExtensionPropertyInfo *and doesn't let us stash any extra data. So, this PR uses the padding that's added byMemory::alloc_static()to stash the pointer in the same place that we usually put the element count when doingmemnew_arr().This is a little hacky, and it would be better if Godot gave us a place to stash some extra data instead, but this does seem to work in my testing :-)
Fixes godotengine/godot#115017