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

Merge pull request #51083 from akien-mga/variantparser-fix-crash-42115

Browse Source 
VariantParser: Fix uninitialized ResourceParser funcs
This commit is contained in:
Rémi Verschelde 2021-07-31 00:02:23 +02:00 committed by GitHub
commit f2efa6f4f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats 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;
} }