From aad6bdad946e54e567d6cd22abfa2d829db6b871 Mon Sep 17 00:00:00 2001 From: Guilherme Felipe Date: Sun, 27 May 2018 20:55:05 -0300 Subject: [PATCH] Add validation in set_custom_mouse_cursor Check if the image is valid. --- platform/osx/os_osx.mm | 1 + platform/windows/os_windows.cpp | 1 + platform/x11/os_x11.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 5589f93a5d8..d339c75af4e 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1543,6 +1543,7 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); + ERR_FAIL_COND(!image.is_valid()); image = texture->get_data(); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 8d664b58325..0e42a20dd7f 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2074,6 +2074,7 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); + ERR_FAIL_COND(!image.is_valid()); image = texture->get_data(); diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 7b514d0f902..5891f936267 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -2449,6 +2449,7 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); + ERR_FAIL_COND(!image.is_valid()); image = texture->get_data();