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

VariantParser: Fix uninitialized ResourceParser funcs

Browse Source 
They could cause a segfault when parsing values with ID "Resource"
as apparently we never set a valid `func` for it.

Fixes crash part of #42115.
This commit is contained in:
Rémi Verschelde
2021-07-30 23:22:00 +02:00
parent 5a30ba7a66
commit f3aaa713d9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/variant/variant_parser.h
View File

@ -73,9 +73,9 @@ public:
struct ResourceParser { struct ResourceParser {
void *userdata = nullptr; void *userdata = nullptr;
ParseResourceFunc func; ParseResourceFunc func = nullptr;
ParseResourceFunc ext_func; ParseResourceFunc ext_func = nullptr;
ParseResourceFunc sub_func; ParseResourceFunc sub_func = nullptr;
}; };
enum TokenType { enum TokenType {

1
scene/resources/resource_format_text.cpp
View File

@ -982,7 +982,6 @@ void ResourceLoaderText::open(FileAccess *p_f, bool p_skip_first_tag) {
rp.ext_func = _parse_ext_resources; rp.ext_func = _parse_ext_resources;
rp.sub_func = _parse_sub_resources; rp.sub_func = _parse_sub_resources;
rp.func = nullptr;
rp.userdata = this; rp.userdata = this;
} }