godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19210 from guilhermefelipecgs/fix_invalid_image

Browse Source 
Add validation in set_custom_mouse_cursor
This commit is contained in:
Max Hilbrunner 2018-05-28 12:52:10 +02:00 committed by GitHub
commit 856d945248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/osx/os_osx.mm
View File

@ -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();

1
platform/windows/os_windows.cpp
View File

@ -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();

1
platform/x11/os_x11.cpp
View File

@ -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();