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

akien-mga · akien-mga · commit 60b927b4cf0e · 2024-02-23T11:29:54.000+01:00
Fix crash when using OpenXR extension wrappers from GDExtension
diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp
@@ -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();
 }

Original file line number	Diff line number	Diff line change
`@@ -1532,7 +1532,13 @@ void OpenXRAPI::register_extension_metadata() {`
`1532`	`1532`
`1533`	`1533`	`void OpenXRAPI::cleanup_extension_wrappers() {`
`1534`	`1534`	`for (OpenXRExtensionWrapper *extension_wrapper : registered_extension_wrappers) {`
`1535`		`- memdelete(extension_wrapper);`
	`1535`	`+ // Fix crash when the extension wrapper comes from GDExtension.`
	`1536`	`+ OpenXRExtensionWrapperExtension gdextension_extension_wrapper = dynamic_cast<OpenXRExtensionWrapperExtension >(extension_wrapper);`
	`1537`	`+ if (gdextension_extension_wrapper) {`
	`1538`	`+ memdelete(gdextension_extension_wrapper);`
	`1539`	`+ } else {`
	`1540`	`+ memdelete(extension_wrapper);`
	`1541`	`+ }`
`1536`	`1542`	`}`
`1537`	`1543`	`registered_extension_wrappers.clear();`
`1538`	`1544`	`}`