summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-01-18 09:35:30 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-01-18 09:35:30 +0100
commit29116a81df9f07c52db4d33cebdc68c5557af5eb (patch)
treeab31f0695b8de0ba60675be7de7c18d970370a92
parent90a5164536d56364ce37cc41ea89040a8f4a8c63 (diff)
parentdc325069fe0dc3e2a660c25ee73c43ea467effb5 (diff)
downloadredot-engine-29116a81df9f07c52db4d33cebdc68c5557af5eb.tar.gz
Merge pull request #87306 from aaronfranke/fix-gltf-buf-view-crash
Fix crash in `GLTFBufferView::load_buffer_view_data`
-rw-r--r--modules/gltf/structures/gltf_buffer_view.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/gltf/structures/gltf_buffer_view.cpp b/modules/gltf/structures/gltf_buffer_view.cpp
index d40ed69915..8588de0752 100644
--- a/modules/gltf/structures/gltf_buffer_view.cpp
+++ b/modules/gltf/structures/gltf_buffer_view.cpp
@@ -94,6 +94,7 @@ void GLTFBufferView::set_indices(bool p_indices) {
}
Vector<uint8_t> GLTFBufferView::load_buffer_view_data(const Ref<GLTFState> p_state) const {
+ ERR_FAIL_COND_V(p_state.is_null(), Vector<uint8_t>());
ERR_FAIL_COND_V_MSG(byte_stride > 0, Vector<uint8_t>(), "Buffer views with byte stride are not yet supported by this method.");
const TypedArray<Vector<uint8_t>> &buffers = p_state->get_buffers();
ERR_FAIL_INDEX_V(buffer, buffers.size(), Vector<uint8_t>());