diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-28 12:52:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 12:52:10 +0200 |
| commit | 856d945248a8ff3518de80eba48f19d2388c06f9 (patch) | |
| tree | 41a54974737b28f46e66b1474486bd314923784a /platform | |
| parent | ced113136b2ff9e838bbc86ea798ac8afe6e1062 (diff) | |
| parent | aad6bdad946e54e567d6cd22abfa2d829db6b871 (diff) | |
Merge pull request #19210 from guilhermefelipecgs/fix_invalid_image
Add validation in set_custom_mouse_cursor
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/os_osx.mm | 1 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 1 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 404ee5f476..a04783d2ca 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 af03432838..f013d1a6ad 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 efa55ddf58..774fceff6d 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(); |