Browse Source

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

VariantParser: Fix uninitialized ResourceParser funcs
Rémi Verschelde 4 years ago
parent
commit
f2efa6f4f3
2 changed files with 3 additions and 4 deletions
  1. 3 3
      core/variant/variant_parser.h
  2. 0 1
      scene/resources/resource_format_text.cpp

+ 3 - 3
core/variant/variant_parser.h

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

+ 0 - 1
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.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;
 }
 }