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

Merge pull request #34829 from timothyqiu/checks-bundle 

Fixes crash for bad property of PackedScene
This commit is contained in:
Rémi Verschelde 2020-01-06 13:43:38 +01:00 committed by GitHub
parent 8454804972 4b660a87d8
commit 080e6e48ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/resources/packed_scene.cpp
View File

@ -1097,6 +1097,14 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) {
ERR_FAIL_COND_MSG(version > PACK_VERSION, "Save format version too new.");
const int node_count = p_dictionary["node_count"];
const PoolVector<int> snodes = p_dictionary["nodes"];
ERR_FAIL_COND(snodes.size() != node_count);
const int conn_count = p_dictionary["conn_count"];
const PoolVector<int> sconns = p_dictionary["conns"];
ERR_FAIL_COND(sconns.size() != conn_count);
PoolVector<String> snames = p_dictionary["names"];
if (snames.size()) {
@ -1121,13 +1129,11 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) {
variants.clear();
}
nodes.resize(p_dictionary["node_count"]);
int nc = nodes.size();
if (nc) {
PoolVector<int> snodes = p_dictionary["nodes"];
nodes.resize(node_count);
if (node_count) {
PoolVector<int>::Read r = snodes.read();
int idx = 0;
for (int i = 0; i < nc; i++) {
for (int i = 0; i < node_count; i++) {
NodeData &nd = nodes.write[i];
nd.parent = r[idx++];
nd.owner = r[idx++];
@ -1151,15 +1157,11 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) {
}
}
connections.resize(p_dictionary["conn_count"]);
int cc = connections.size();
if (cc) {
PoolVector<int> sconns = p_dictionary["conns"];
connections.resize(conn_count);
if (conn_count) {
PoolVector<int>::Read r = sconns.read();
int idx = 0;
for (int i = 0; i < cc; i++) {
for (int i = 0; i < conn_count; i++) {
ConnectionData &cd = connections.write[i];
cd.from = r[idx++];
cd.to = r[idx++];