Really fix the custom cursor hotspot

Add check for negative values. Fixes godotengine#21721
jazztickets · Sep 4, 2018 · bcee652 · bcee652
1 parent f50dd68
commit bcee652
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
@@ -1604,6 +1604,7 @@ virtual void log_error(const char *p_function, const char *p_file, int p_line, c
 		}
 
 		ERR_FAIL_COND(!texture.is_valid());
+		ERR_FAIL_COND(p_hotspot.x < 0 || p_hotspot.y < 0);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height);
 

diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
@@ -2252,6 +2252,7 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
 		}
 
 		ERR_FAIL_COND(!texture.is_valid());
+		ERR_FAIL_COND(p_hotspot.x < 0 || p_hotspot.y < 0);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height);
 

diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
@@ -2534,6 +2534,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(p_hotspot.x < 0 || p_hotspot.y < 0);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height);