config: Remove asserts and redundancies and switch to heap for Config::Save

Author: joel16

app/source/config.cpp

@@ -12,59 +12,49 @@ config_t cfg;
 namespace Config {
     int Save(config_t config) {
         int ret = 0;
-        char *buf = new char[128];
+        char buf[128];
         int len = std::snprintf(buf, 128, config_file, config_version, cfg.sort, cfg.dark_theme, cfg.dev_options);
 
         if (R_FAILED(ret = FS::WriteFile("config.json", buf, len))) {
-            Log::Error("Read config failed in Config_Save 0x%08x\n", ret);
-            delete[] buf;
+            Log::Error("%s failed: 0x%08x\n", __func__, ret);
             return ret;
         }
 
-        delete[] buf;
         return 0;
     }
 
-    static void SetDefault(config_t &config) {
-        config.sort = 0;
-        config.dark_theme = false;
-        config.dev_options = false;
-    }
-
     int Load(void) {
         int ret = 0;
 
         // Set root path and current working directory based on model.
         cfg.cwd = is_psp_go? "ef0:" : "ms0:";
-        
-        if (is_psp_go)
-            device = BROWSE_STATE_INTERNAL;
-        else
-            device = BROWSE_STATE_EXTERNAL;
+        device = is_psp_go ? BROWSE_STATE_INTERNAL : BROWSE_STATE_EXTERNAL;
 
         if (!FS::FileExists("config.json")) {
-            Config::SetDefault(cfg);
-            return Save(cfg);
+            cfg = config_t();
+            cfg.cwd = is_psp_go? "ef0:" : "ms0:";
+            return Config::Save(cfg);
         }
 
         u64 size = FS::GetFileSize("config.json");
         char *buf = new char[size];
 
         if (R_FAILED(ret = FS::ReadFile("config.json", buf, size))) {
-            Log::Error("Read config failed in Config_Load 0x%08x\n", ret);
+            Log::Error("%s(FS::ReadFile) failed: 0x%08x\n", __func__, ret);
             delete[] buf;
             return ret;
         }
 
         buf[size] = '\0';
-        
         rapidjson::Document document;
         document.Parse(buf);
-        assert(document.IsObject());
-        assert(document.HasMember("config_ver"));
-        assert(document.HasMember("sort"));
-        assert(document.HasMember("dark_theme"));
-        assert(document.HasMember("dev_options"));
+        
+        if ((!document.IsObject()) || (!document.HasMember("config_ver")) || (!document.HasMember("sort")) ||
+            (!document.HasMember("dark_theme")) || (!document.HasMember("dev_options"))) {
+            Log::Error("%s failed: Malformed config file, resetting\n", __func__);
+            cfg = config_t();
+            return Config::Save(cfg);
+        }
 
         config_version_holder = document["config_ver"].GetInt();
         cfg.sort = document["sort"].GetInt();
@@ -76,7 +66,7 @@ namespace Config {
         // delete[] config file if config file is updated. This will rarely happen.
         if (config_version_holder < config_version) {
             sceIoRemove("config.json");
-            Config::SetDefault(cfg);
+            cfg = config_t();
             return Config::Save(cfg);
         }