godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add check to internal methods to prevent crash

Browse Source 
(cherry picked from commit 448295cd51)
This commit is contained in:
Haoyu Qiu 2021-07-27 12:26:13 +08:00 committed by Rémi Verschelde
parent 10d07e02f2
commit 4641e6b170
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/2d/tile_map.cpp
View File

@ -1217,6 +1217,7 @@ void TileMap::_set_tile_data(const PoolVector<int> &p_data) {
PoolVector<int>::Read r = p_data.read(); PoolVector<int>::Read r = p_data.read();
int offset = (format == FORMAT_2) ? 3 : 2; int offset = (format == FORMAT_2) ? 3 : 2;
ERR_FAIL_COND_MSG(c % offset != 0, "Corrupted tile data.");
clear(); clear();
for (int i = 0; i < c; i += offset) { for (int i = 0; i < c; i += offset) {

2
scene/3d/proximity_group.cpp
View File

@ -140,7 +140,7 @@ void ProximityGroup::broadcast(String p_method, Variant p_parameters) {
void ProximityGroup::_proximity_group_broadcast(String p_method, Variant p_parameters) { void ProximityGroup::_proximity_group_broadcast(String p_method, Variant p_parameters) {
if (dispatch_mode == MODE_PROXY) { if (dispatch_mode == MODE_PROXY) {
ERR_FAIL_COND(!is_inside_tree());
get_parent()->call(p_method, p_parameters); get_parent()->call(p_method, p_parameters);
} else { } else {