Make EACopy more robust against crashes when logging long command lin…

…e args.
electronicarts · Jun 5, 2023 · 0708779 · 0708779
1 parent 77cdc0b
commit 0708779
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/include/EACopyClient.h b/include/EACopyClient.h
@@ -10,7 +10,7 @@ namespace eacopy
 
 enum : uint {
 	ClientMajorVersion = 1,
-	ClientMinorVersion = 15
+	ClientMinorVersion = 16
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/source/EACopy.cpp b/source/EACopy.cpp
@@ -500,7 +500,16 @@ int main(int argc, char* argv_[])
 		logInfoLinef();
 		logInfoLinef(L"  Source : %ls", settings.sourceDirectory.c_str());
 		logInfoLinef(L"    Dest : %ls", settings.destDirectory.c_str());
-		logInfoLinef(L" Options :%ls", options.c_str()); // First space added in generated string
+		if (options.length() > (LogBufferSize - 20))
+		{
+			WString optionsSubStr = options.substr(0, (LogBufferSize - 20));
+			optionsSubStr.append(L" ... ");
+			logInfoLinef(L" Options :%ls", optionsSubStr.c_str());
+		}
+		else
+		{
+			logInfoLinef(L" Options :%ls", options.c_str()); // First space added in generated string
+		}
 		logInfoLinef();
 		logInfoLinef(L"-------------------------------------------------------------------------------");
 		logInfoLinef();