fix(native,log) : log config error handling to prevent crashing

Author: arthur740212

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/dllmain.cpp

@@ -428,17 +428,6 @@ EOS_ELogLevel eos_loglevel_str_to_enum(const std::string& str)
     }
 }
 
-void eos_set_loglevel(const LogLevelConfig& log_config)
-{
-    if (EOS_Logging_SetLogLevel_ptr != nullptr)
-    {
-        for (size_t i = 0; i < log_config.category.size() - 1; i++)
-        {
-            EOS_Logging_SetLogLevel_ptr((EOS_ELogCategory)i, eos_loglevel_str_to_enum(log_config.level[i]));
-        }
-    }
-}
-
 //-------------------------------------------------------------------------
 static void show_log_as_dialog(const char* log_string)
 {
@@ -966,7 +955,7 @@ static LogLevelConfig log_config_from_json_value(json_value_s* config_json)
 
     while (iter != nullptr)
     {
-        if (!strcmp("logCategoryLevelPairs", iter->name->string))
+        if (!strcmp("LogCategoryLevelPairs", iter->name->string))
         {
             json_array_s* pairs = json_value_as_array(iter->value);
             for (auto e = pairs->start; e != nullptr; e = e->next)
@@ -975,11 +964,11 @@ static LogLevelConfig log_config_from_json_value(json_value_s* config_json)
                 struct json_object_element_s* pairs_iter = pairs_json_object->start;
                 while (pairs_iter != nullptr)
                 {
-                    if (!strcmp("category", pairs_iter->name->string))
+                    if (!strcmp("Category", pairs_iter->name->string))
                     {
                         log_config.category.push_back(json_value_as_string(pairs_iter->value)->string);
                     }
-                    else if (!strcmp("level", pairs_iter->name->string))
+                    else if (!strcmp("Level", pairs_iter->name->string))
                     {
                         log_config.level.push_back(json_value_as_string(pairs_iter->value)->string);
                     }
@@ -1252,6 +1241,49 @@ static void eos_call_steam_init(const std::string& steam_dll_path)
     }
 }
 
+//-------------------------------------------------------------------------
+void eos_set_loglevel_via_config()
+{
+    if (EOS_Logging_SetLogLevel_ptr == nullptr)
+    {
+        return;
+    }
+
+    auto path_to_log_config_json = get_path_for_eos_service_config(EOS_LOGLEVEL_CONFIG_FILENAME);
+
+    if (!std::filesystem::exists(path_to_log_config_json))
+    {
+        log_inform("Log level config not found, using default log levels");
+        return;
+    }
+
+    json_value_s* log_config_as_json = read_config_json_as_json_from_path(path_to_log_config_json);
+    LogLevelConfig log_config = log_config_from_json_value(log_config_as_json);
+    free(log_config_as_json);
+
+    // Validation to prevent out of range exception
+    if (log_config.category.size() != log_config.level.size())
+    {
+        log_warn("Log level config entries out of range");
+        return;
+    }
+
+    // Last in the vector is AllCategories, and will not be set
+    size_t individual_category_size = log_config.category.size() > 0 ? log_config.category.size() - 1 : 0;
+    if (individual_category_size == 0)
+    {
+        log_warn("Log level config entries empty");
+        return;
+    }
+
+    for (size_t i = 0; i < individual_category_size; i++)
+    {
+        EOS_Logging_SetLogLevel_ptr((EOS_ELogCategory)i, eos_loglevel_str_to_enum(log_config.level[i]));
+    }
+
+    log_inform("Log levels set according to config");
+}
+
 //-------------------------------------------------------------------------
 void eos_create(EOSConfig& eosConfig)
 {
@@ -1519,12 +1551,6 @@ DLL_EXPORT(void) UnityPluginLoad(void*)
     EOSConfig eos_config = eos_config_from_json_value(eos_config_as_json);
     free(eos_config_as_json);
 
-    auto path_to_log_config_json = get_path_for_eos_service_config(EOS_LOGLEVEL_CONFIG_FILENAME);
-    json_value_s* log_config_as_json = read_config_json_as_json_from_path(path_to_log_config_json);
-    LogLevelConfig log_config = log_config_from_json_value(log_config_as_json);
-    free(log_config_as_json);
-    global_logf("NativePlugin log sonfig size (%d)", log_config.category.size());
-
 #if PLATFORM_WINDOWS
     //support sandbox and deployment id override via command line arguments
     std::stringstream argStream = std::stringstream(GetCommandLineA());
@@ -1626,7 +1652,7 @@ DLL_EXPORT(void) UnityPluginLoad(void*)
 
             eos_init(eos_config);
 
-            eos_set_loglevel(log_config);
+            eos_set_loglevel_via_config();
             //log_warn("start eos create");
             eos_create(eos_config);