diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-07 10:58:01 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-07 10:58:01 +0100 |
| commit | 4f478a55cc40df50b7dd26aef8bf31bc493a79d9 (patch) | |
| tree | bb9bc8ded3d4dfef0fea41975d57d28948a5e64e /platform/ios | |
| parent | a5b44c06888e9b3f2f472e3e2d341102b43da887 (diff) | |
| parent | d5a5dd52e82c171a3eba449cfdee9eb3be1323d7 (diff) | |
| download | redot-engine-4f478a55cc40df50b7dd26aef8bf31bc493a79d9.tar.gz | |
Merge pull request #86843 from RandomShaper/fix_null_ptr
Avoid several null-dereferences of ApiContextRD
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/display_server_ios.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm index c660dc5697..2f2878bfc0 100644 --- a/platform/ios/display_server_ios.mm +++ b/platform/ios/display_server_ios.mm @@ -87,17 +87,19 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode 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); |