Merge pull request #86843 from RandomShaper/fix_null_ptr

Avoid several null-dereferences of ApiContextRD
godotengine · Feb 7, 2024 · 4f478a5 · 4f478a5
2 parents a5b44c0 + d5a5dd5
commit 4f478a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp
@@ -538,9 +538,10 @@ void DisplayServerAndroid::reset_window() {
 #endif
 
 		if (context_rd->window_create(MAIN_WINDOW_ID, last_vsync_mode, display_size.width, display_size.height, &wpd) != OK) {
+			ERR_PRINT(vformat("Failed to reset %s window.", context_rd->get_api_name()));
 			memdelete(context_rd);
 			context_rd = nullptr;
-			ERR_FAIL_MSG(vformat("Failed to reset %s window.", context_rd->get_api_name()));
+			return;
 		}
 	}
 #endif
@@ -575,9 +576,10 @@ DisplayServerAndroid::DisplayServerAndroid(const String &p_rendering_driver, Dis
 
 	if (context_rd) {
 		if (context_rd->initialize() != OK) {
+			ERR_PRINT(vformat("Failed to initialize %s context", context_rd->get_api_name()));
 			memdelete(context_rd);
 			context_rd = nullptr;
-			ERR_FAIL_MSG(vformat("Failed to initialize %s context", context_rd->get_api_name()));
+			return;
 		}
 
 		Size2i display_size = OS_Android::get_singleton()->get_display_size();
@@ -596,9 +598,10 @@ DisplayServerAndroid::DisplayServerAndroid(const String &p_rendering_driver, Dis
 #endif
 
 		if (context_rd->window_create(MAIN_WINDOW_ID, p_vsync_mode, display_size.width, display_size.height, &wpd) != OK) {
+			ERR_PRINT(vformat("Failed to create %s window.", context_rd->get_api_name()));
 			memdelete(context_rd);
 			context_rd = nullptr;
-			ERR_FAIL_MSG(vformat("Failed to create %s window.", context_rd->get_api_name()));
+			return;
 		}
 
 		rendering_device = memnew(RenderingDevice);

diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm
@@ -87,17 +87,19 @@
 
 	if (context_rd) {
 		if (context_rd->initialize() != OK) {
+			ERR_PRINT(vformat("Failed to initialize %s context", context_rd->get_api_name()));
 			memdelete(context_rd);
 			context_rd = nullptr;
-			ERR_FAIL_MSG(vformat("Failed to initialize %s context", context_rd->get_api_name()));
+			return;
 		}
 
 		Size2i size = Size2i(layer.bounds.size.width, layer.bounds.size.height) * screen_get_max_scale();
 		if (context_rd->window_create(MAIN_WINDOW_ID, p_vsync_mode, size.width, size.height, &wpd) != OK) {
+			ERR_PRINT(vformat("Failed to create %s window.", context_rd->get_api_name()));
 			memdelete(context_rd);
 			context_rd = nullptr;
 			r_error = ERR_UNAVAILABLE;
-			ERR_FAIL_MSG(vformat("Failed to create %s window.", context_rd->get_api_name()));
+			return;
 		}
 
 		rendering_device = memnew(RenderingDevice);

diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp
@@ -6080,10 +6080,11 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 
 	if (context_rd) {
 		if (context_rd->initialize() != OK) {
+			ERR_PRINT(vformat("Could not initialize %s", context_rd->get_api_name()));
 			memdelete(context_rd);
 			context_rd = nullptr;
 			r_error = ERR_CANT_CREATE;
-			ERR_FAIL_MSG(vformat("Could not initialize %s", context_rd->get_api_name()));
+			return;
 		}
 		driver_found = true;
 	}

diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
@@ -4625,10 +4625,11 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 			}
 #endif
 			if (context_rd->window_create(id, p_vsync_mode, WindowRect.right - WindowRect.left, WindowRect.bottom - WindowRect.top, &wpd) != OK) {
+				ERR_PRINT(vformat("Failed to create %s Window.", context_rd->get_api_name()));
 				memdelete(context_rd);
 				context_rd = nullptr;
 				windows.erase(id);
-				ERR_FAIL_V_MSG(INVALID_WINDOW_ID, vformat("Failed to create %s Window.", context_rd->get_api_name()));
+				return INVALID_WINDOW_ID;
 			}
 			wd.context_created = true;
 		}