Sanitize the % symbol when logging mod (directory) names to log.txt

(cherry picked from commit 6b42fc3)

Author: ConnorForan

libzhl/IsaacRepentance_static.cpp

@@ -1,6 +1,7 @@
 #include "IsaacRepentance.h"
 #include "Log.h"
 #include <cmath>
+#include <regex>
 
 bool Room::IsValidRailType(int rail) {
 	if (rail < 0 || rail > RailType::RAIL_NONE) {
@@ -463,6 +464,11 @@ void KAGE::_LogMessage(int flag, const char* fmt, ...) {
 	}
 }
 
+// Sanitizes the % character from the provided string to make sure it is not interpreted as a format specifier.
+void KAGE::SafeLogMessage(int flag, const char* nonFormatString) {
+	LogMessage(flag, std::regex_replace(nonFormatString, std::regex("%"), "%%").c_str());
+}
+
 std::optional<std::string> KAGE_Filesys_ContentManager::GetMountedFilePath(const char* filePath) {
 	const char* rawPath = GetMountedFilePath_DeleteMe(filePath);
 	if (rawPath) {

libzhl/functions/KAGE.zhl

@@ -6,5 +6,6 @@ static cleanup void KAGE::LogMessage(int flag, const char* string);
 struct KAGE  {
     {{
     LIBZHL_API static void _LogMessage(int flag, const char* fmt, ...);
+    LIBZHL_API static void SafeLogMessage(int flag, const char* nonFormatString);
     }}
 } : 0;

repentogon/Patches/XMLData.cpp

@@ -380,7 +380,7 @@ void UpdateXMLModEntryData() {
 		XMLStuff.ModData->byfullpath[mod["fulldirectory"]] = idx;
 
 	}
-	KAGE::LogMessage(0, enabledmodslist.c_str());
+	KAGE::SafeLogMessage(0, enabledmodslist.c_str());
 	KAGE::LogMessage(0, "-- Enabled Mods END -- \n");
 }
 
@@ -2544,7 +2544,7 @@ void ProcessXmlNode(xml_node<char>* node,bool force = false) {
 		XMLStuff.ModData->byorder[XMLStuff.ModData->nodes.size()] = id;
 
 		string loadingmodmsg = "Loading: " + mod["directory"] + "(" + mod["id"] +  ") \n";
-		KAGE::LogMessage(0, loadingmodmsg.c_str());
+		KAGE::SafeLogMessage(0, loadingmodmsg.c_str());
 	}
 	break;
 	case 26: //fxlayers
@@ -2571,7 +2571,7 @@ HOOK_METHOD(xmlnode_rep, first_node, (char* name, int size, bool casesensitive)-
 		if ((currpath.length() > 0) && (err != nullptr)){
 			string error = "[XMLError] " + xmlerrors[toint(err->value())] + " in " + currpath;
 			g_Game->GetConsole()->PrintError(error);
-			KAGE::LogMessage(3,(error + "\n").c_str());
+			KAGE::SafeLogMessage(3,(error + "\n").c_str());
 			//ZHL::Log("%s \n", error.c_str());
 		}
 		ProcessXmlNode(node);

repentogon/Patches/XMLData.h

@@ -1006,7 +1006,7 @@ inline bool XMLParse(xml_document<char>* xmldoc, char* xml, const string& dir) {
 		string reason = err.what() + string(" at line ") + to_string(lineNumber);
 		string error = "[XMLError] " + reason + " in " + dir;
 		g_Game->GetConsole()->PrintError(error);
-		KAGE::LogMessage(3, (error + "\n").c_str());
+		KAGE::SafeLogMessage(3, (error + "\n").c_str());
 		//printf("%s \n", error.c_str());
 		//mclear(xmldoc);
 	}