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

Merge pull request #88689 from dsnopek/openxr-extension-wrapper-crash 

Fix crash when using OpenXR extension wrappers from GDExtension
This commit is contained in:
Rémi Verschelde 2024-02-23 11:29:54 +01:00
parent 0072a0ba31 713ea0629a
commit 60b927b4cf
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openxr/openxr_api.cpp
View File

@ -1532,7 +1532,13 @@ void OpenXRAPI::register_extension_metadata() {
void OpenXRAPI::cleanup_extension_wrappers() {
for (OpenXRExtensionWrapper *extension_wrapper : registered_extension_wrappers) {
memdelete(extension_wrapper);
// Fix crash when the extension wrapper comes from GDExtension.
OpenXRExtensionWrapperExtension *gdextension_extension_wrapper = dynamic_cast<OpenXRExtensionWrapperExtension *>(extension_wrapper);
if (gdextension_extension_wrapper) {
memdelete(gdextension_extension_wrapper);
} else {
memdelete(extension_wrapper);
}
}
registered_extension_wrappers.clear();
}