diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-31 00:02:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 00:02:23 +0200 |
| commit | f2efa6f4f38895a4adf8efc1e4f358a8dc5779cb (patch) | |
| tree | c880e10e77ebcac2d177e1abb31ab34fe690804f | |
| parent | 63be3c1f006c0f033925c3fe9afe5ba39f4df0ea (diff) | |
| parent | f3aaa713d9296bae68a6db91157a2063f01fddc5 (diff) | |
Merge pull request #51083 from akien-mga/variantparser-fix-crash-42115
VariantParser: Fix uninitialized ResourceParser funcs
| -rw-r--r-- | core/variant/variant_parser.h | 6 | ||||
| -rw-r--r-- | scene/resources/resource_format_text.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/variant/variant_parser.h b/core/variant/variant_parser.h index 05fc29b5e0..1ba26db6ed 100644 --- a/core/variant/variant_parser.h +++ b/core/variant/variant_parser.h @@ -73,9 +73,9 @@ public: struct ResourceParser { void *userdata = nullptr; - ParseResourceFunc func; - ParseResourceFunc ext_func; - ParseResourceFunc sub_func; + ParseResourceFunc func = nullptr; + ParseResourceFunc ext_func = nullptr; + ParseResourceFunc sub_func = nullptr; }; enum TokenType { diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index 3f6e926aa7..250a2311a0 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -982,7 +982,6 @@ void ResourceLoaderText::open(FileAccess *p_f, bool p_skip_first_tag) { rp.ext_func = _parse_ext_resources; rp.sub_func = _parse_sub_resources; - rp.func = nullptr; rp.userdata = this; } |