diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-27 07:51:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 07:51:36 +0200 |
| commit | ae1b124e1432beb8d25ee4a89f6a5c9af2876ea8 (patch) | |
| tree | 9ed828f8407e9cc87c120fe2127428516053f5e4 | |
| parent | 8ff29d1879780fe6cdf0d24d6b92bf9a1275bfa3 (diff) | |
| parent | 448295cd5183dc8cc168651aa69f5569538dce54 (diff) | |
Merge pull request #50925 from timothyqiu/internal-checks
Add checks to internal methods to prevent crash
| -rw-r--r-- | scene/2d/tile_map.cpp | 1 | ||||
| -rw-r--r-- | scene/3d/proximity_group_3d.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 3932f3dc78..e9efa1cf84 100644 --- 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 index 037110eaa1..c8c61a9f00 100644 --- 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); |