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/windows | |
| 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/windows')
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index fa73740e04..c5bcb70d9f 100644 --- 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; } |