Browse Source

Merge pull request #19210 from guilhermefelipecgs/fix_invalid_image

Add validation in set_custom_mouse_cursor
Max Hilbrunner 7 years ago
parent
commit
856d945248
3 changed files with 3 additions and 0 deletions
  1. 1 0
      platform/osx/os_osx.mm
  2. 1 0
      platform/windows/os_windows.cpp
  3. 1 0
      platform/x11/os_x11.cpp

+ 1 - 0
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.is_valid());
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
+		ERR_FAIL_COND(!image.is_valid());
 
 
 		image = texture->get_data();
 		image = texture->get_data();
 
 

+ 1 - 0
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.is_valid());
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
+		ERR_FAIL_COND(!image.is_valid());
 
 
 		image = texture->get_data();
 		image = texture->get_data();
 
 

+ 1 - 0
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.is_valid());
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
+		ERR_FAIL_COND(!image.is_valid());
 
 
 		image = texture->get_data();
 		image = texture->get_data();