summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkobewi <kobewi4e@gmail.com>2023-06-14 22:02:39 +0200
committerkobewi <kobewi4e@gmail.com>2023-06-14 22:02:39 +0200
commit4d4fe94cf09c4e069f0ac4e86c8268014b6b3783 (patch)
tree2f90cab4b9f2eff4aff23f419ff1970b60963078
parent33957aee69683cf1f542a8622e5a9efd23070f1c (diff)
downloadredot-engine-4d4fe94cf09c4e069f0ac4e86c8268014b6b3783.tar.gz
Safe-guard against missing node arrays
-rw-r--r--scene/resources/packed_scene.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index f84dfe0d7a..23942658cc 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -473,7 +473,10 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
const String base_property = string_property.get_slice("/", 0);
const int index = string_property.get_slice("/", 2).to_int();
- Array array = dnp.base->get(base_property);
+ bool valid;
+ Array array = dnp.base->get(base_property, &valid);
+ ERR_CONTINUE(!valid);
+
if (array.size() >= index) {
array.push_back(other);
} else {