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/linuxbsd/x11/display_server_x11.cpp | |
| 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/linuxbsd/x11/display_server_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/x11/display_server_x11.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 20e2e897f2..93d528bab6 100644 --- 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; } |