Merge pull request #50925 from timothyqiu/internal-checks

Add checks to internal methods to prevent crash
godotengine · Jul 27, 2021 · ae1b124 · ae1b124
2 parents 8ff29d1 + 448295c
commit ae1b124
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
@@ -795,6 +795,7 @@ void TileMap::_set_tile_data(const Vector<int> &p_data) {
 	const int *r = p_data.ptr();
 
 	int offset = (format >= FORMAT_2) ? 3 : 2;
+	ERR_FAIL_COND_MSG(c % offset != 0, "Corrupted tile data.");
 
 	clear();
 

diff --git a/scene/3d/proximity_group_3d.cpp b/scene/3d/proximity_group_3d.cpp
@@ -128,6 +128,7 @@ void ProximityGroup3D::broadcast(String p_method, Variant p_parameters) {
 
 void ProximityGroup3D::_proximity_group_broadcast(String p_method, Variant p_parameters) {
 	if (dispatch_mode == MODE_PROXY) {
+		ERR_FAIL_COND(!is_inside_tree());
 		get_parent()->call(p_method, p_parameters);
 	} else {
 		emit_signal(SNAME("broadcast"), p_method, p_parameters);