diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-01 11:29:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 11:29:19 +0200 |
| commit | 6ed3e9c182627385bf7e249bf770e845d0b949d8 (patch) | |
| tree | 02b75f6d38b31649e3cccbe3dcc50cef2beabcd0 | |
| parent | 8be97e3b51f5adbee0f9f5d3193da53680a44695 (diff) | |
| parent | 82f7f2c46c023629042d16ada5d5085bd29bb9ad (diff) | |
Merge pull request #53208 from timothyqiu/headless-crash
| -rw-r--r-- | scene/3d/mesh_instance_3d.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/navigation_mesh.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/rendering_server_default.cpp | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp index 4de67dd5dc..67f4a88228 100644 --- a/scene/3d/mesh_instance_3d.cpp +++ b/scene/3d/mesh_instance_3d.cpp @@ -369,6 +369,8 @@ void MeshInstance3D::create_debug_tangents() { for (int i = 0; i < mesh->get_surface_count(); i++) { Array arrays = mesh->surface_get_arrays(i); + ERR_CONTINUE(arrays.size() != Mesh::ARRAY_MAX); + Vector<Vector3> verts = arrays[Mesh::ARRAY_VERTEX]; Vector<Vector3> norms = arrays[Mesh::ARRAY_NORMAL]; if (norms.size() == 0) { diff --git a/scene/resources/navigation_mesh.cpp b/scene/resources/navigation_mesh.cpp index d0e0f15ef6..d87056f55d 100644 --- a/scene/resources/navigation_mesh.cpp +++ b/scene/resources/navigation_mesh.cpp @@ -41,6 +41,8 @@ void NavigationMesh::create_from_mesh(const Ref<Mesh> &p_mesh) { continue; } Array arr = p_mesh->surface_get_arrays(i); + ERR_CONTINUE(arr.size() != Mesh::ARRAY_MAX); + Vector<Vector3> varr = arr[Mesh::ARRAY_VERTEX]; Vector<int> iarr = arr[Mesh::ARRAY_INDEX]; if (varr.size() == 0 || iarr.size() == 0) { diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp index bed6ade1f6..62390f9d4d 100644 --- a/servers/rendering/rendering_server_default.cpp +++ b/servers/rendering/rendering_server_default.cpp @@ -45,6 +45,9 @@ int RenderingServerDefault::changes = 0; /* FREE */ void RenderingServerDefault::_free(RID p_rid) { + if (unlikely(p_rid.is_null())) { + return; + } if (RSG::storage->free(p_rid)) { return; } |