skip empty or single-space command line arguments (#393)

2 files changed, 7 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46145a9f5..91e3302bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,11 +21,12 @@
                 },
             },
         }
-- Improvement: `--cache-memlayer-sizethreshold` is now deprecated and has a new name: `--cache-bucket-memlayer-sizethreshold` to line up with per cache bucket configuration
 - Bugfix: Handle invalid plugin config file without terminating
 - Bugfix: Gracefully handle errors while running `oplog-mirror`
+- Improvement: `--cache-memlayer-sizethreshold` is now deprecated and has a new name: `--cache-bucket-memlayer-sizethreshold` to line up with per cache bucket configuration
 - Improvement: Remove CAS log files at startup when we write full state index
 - Improvement: Optimize memory-buffered chunk iteration sizes
+- Improvement: Skip command line arguments that are empty or just a single space for `zen` command line tool on Mac/Linux to handle "triple space" problem. UE-273411
 
 ## 5.6.7
 - Feature: Support for `--log-progress` to output UE style `@progress` log messages has been added to
diff --git a/src/zen/zen.cpp b/src/zen/zen.cpp
index 7c21035c0..53fdf3d36 100644
--- a/src/zen/zen.cpp
+++ b/src/zen/zen.cpp
@@ -593,7 +593,11 @@ main(int argc, char** argv)
 	Args.reserve(argc);
 	for (int I = 0; I < argc; I++)
 	{
-		Args.push_back(std::string(argv[I]));
+		std::string Arg(argv[I]);
+		if ((!Arg.empty()) && (Arg != " "))
+		{
+			Args.emplace_back(std::move(Arg));
+		}
 	}
 #endif
 	std::vector<char*> RawArgs = zen::StripCommandlineQuotes(Args);