1 files changed, 24 insertions, 33 deletions

diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp
index 49fa73dab2..bc24cac955 100644
--- a/core/io/config_file.cpp
+++ b/core/io/config_file.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -129,12 +129,9 @@ void ConfigFile::erase_section_key(const String &p_section, const String &p_key)
 
 Error ConfigFile::save(const String &p_path) {
 	Error err;
-	FileAccess *file = FileAccess::open(p_path, FileAccess::WRITE, &err);
+	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
 
 	if (err) {
-		if (file) {
-			memdelete(file);
-		}
 		return err;
 	}
 
@@ -143,17 +140,16 @@ Error ConfigFile::save(const String &p_path) {
 
 Error ConfigFile::save_encrypted(const String &p_path, const Vector<uint8_t> &p_key) {
 	Error err;
-	FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err);
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE, &err);
 
 	if (err) {
 		return err;
 	}
 
-	FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
+	Ref<FileAccessEncrypted> fae;
+	fae.instantiate();
 	err = fae->open_and_parse(f, p_key, FileAccessEncrypted::MODE_WRITE_AES256);
 	if (err) {
-		memdelete(fae);
-		memdelete(f);
 		return err;
 	}
 	return _internal_save(fae);
@@ -161,29 +157,30 @@ Error ConfigFile::save_encrypted(const String &p_path, const Vector<uint8_t> &p_
 
 Error ConfigFile::save_encrypted_pass(const String &p_path, const String &p_pass) {
 	Error err;
-	FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err);
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE, &err);
 
 	if (err) {
 		return err;
 	}
 
-	FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
+	Ref<FileAccessEncrypted> fae;
+	fae.instantiate();
 	err = fae->open_and_parse_password(f, p_pass, FileAccessEncrypted::MODE_WRITE_AES256);
 	if (err) {
-		memdelete(fae);
-		memdelete(f);
 		return err;
 	}
 
 	return _internal_save(fae);
 }
 
-Error ConfigFile::_internal_save(FileAccess *file) {
+Error ConfigFile::_internal_save(Ref<FileAccess> file) {
 	for (OrderedHashMap<String, OrderedHashMap<String, Variant>>::Element E = values.front(); E; E = E.next()) {
 		if (E != values.front()) {
 			file->store_string("\n");
 		}
-		file->store_string("[" + E.key() + "]\n\n");
+		if (!E.key().is_empty()) {
+			file->store_string("[" + E.key() + "]\n\n");
+		}
 
 		for (OrderedHashMap<String, Variant>::Element F = E.get().front(); F; F = F.next()) {
 			String vstr;
@@ -192,16 +189,14 @@ Error ConfigFile::_internal_save(FileAccess *file) {
 		}
 	}
 
-	memdelete(file);
-
 	return OK;
 }
 
 Error ConfigFile::load(const String &p_path) {
 	Error err;
-	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ, &err);
 
-	if (!f) {
+	if (f.is_null()) {
 		return err;
 	}
 
@@ -210,17 +205,16 @@ Error ConfigFile::load(const String &p_path) {
 
 Error ConfigFile::load_encrypted(const String &p_path, const Vector<uint8_t> &p_key) {
 	Error err;
-	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ, &err);
 
 	if (err) {
 		return err;
 	}
 
-	FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
+	Ref<FileAccessEncrypted> fae;
+	fae.instantiate();
 	err = fae->open_and_parse(f, p_key, FileAccessEncrypted::MODE_READ);
 	if (err) {
-		memdelete(fae);
-		memdelete(f);
 		return err;
 	}
 	return _internal_load(p_path, fae);
@@ -228,31 +222,28 @@ Error ConfigFile::load_encrypted(const String &p_path, const Vector<uint8_t> &p_
 
 Error ConfigFile::load_encrypted_pass(const String &p_path, const String &p_pass) {
 	Error err;
-	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ, &err);
 
 	if (err) {
 		return err;
 	}
 
-	FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
+	Ref<FileAccessEncrypted> fae;
+	fae.instantiate();
 	err = fae->open_and_parse_password(f, p_pass, FileAccessEncrypted::MODE_READ);
 	if (err) {
-		memdelete(fae);
-		memdelete(f);
 		return err;
 	}
 
 	return _internal_load(p_path, fae);
 }
 
-Error ConfigFile::_internal_load(const String &p_path, FileAccess *f) {
+Error ConfigFile::_internal_load(const String &p_path, Ref<FileAccess> f) {
 	VariantParser::StreamFile stream;
 	stream.f = f;
 
 	Error err = _parse(p_path, &stream);
 
-	memdelete(f);
-
 	return err;
 }
 
@@ -285,9 +276,9 @@ Error ConfigFile::_parse(const String &p_path, VariantParser::Stream *p_stream)
 			return err;
 		}
 
-		if (assign != String()) {
+		if (!assign.is_empty()) {
 			set_value(section, assign, value);
-		} else if (next_tag.name != String()) {
+		} else if (!next_tag.name.is_empty()) {
 			section = next_tag.name;
 		}
 	}