summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Felipe <guilhermefelipecgs@gmail.com>2018-05-27 20:55:05 -0300
committerGuilherme Felipe <guilhermefelipecgs@gmail.com>2018-05-27 20:55:05 -0300
commitaad6bdad946e54e567d6cd22abfa2d829db6b871 (patch)
treee804987248ef48db5fd2b27c699fea995c3c4cb2
parentc80ac06253e832284be7ae37515b0ca1ecf11a52 (diff)
Add validation in set_custom_mouse_cursor
Check if the image is valid.
-rw-r--r--platform/osx/os_osx.mm1
-rw-r--r--platform/windows/os_windows.cpp1
-rw-r--r--platform/x11/os_x11.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 5589f93a5d..d339c75af4 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 8d664b5832..0e42a20dd7 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 7b514d0f90..5891f93626 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();