- escape double quotes in Cocoa IWAD picker's extra arguments

https://forum.zdoom.org/viewtopic.php?t=71675
ZDoom · Mar 8, 2021 · 952d43b · 952d43b
1 parent d18b74b
commit 952d43b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/common/platform/posix/osx/iwadpicker_cocoa.mm b/src/common/platform/posix/osx/iwadpicker_cocoa.mm
@@ -389,6 +389,8 @@ static void RestartWithParameters(const WadStuff& wad, NSString* parameters)
 	@try
 	{
 		NSString* executablePath = [NSString stringWithUTF8String:Args->GetArg(0)];
+		NSString* escapedParameters = [parameters stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+		NSString* cvarArgument = [NSString stringWithFormat:@"+osx_additional_parameters \"%@\"", escapedParameters];
 
 		NSMutableArray* const arguments = [[NSMutableArray alloc] init];
 		[arguments addObject:@"-arch"];
@@ -398,7 +400,7 @@ static void RestartWithParameters(const WadStuff& wad, NSString* parameters)
 		[arguments addObject:[NSString stringWithUTF8String:wad.Path]];
 		[arguments addObject:@"+defaultiwad"];
 		[arguments addObject:[NSString stringWithUTF8String:wad.Name]];
-		[arguments addObject:[NSString stringWithFormat:@"+osx_additional_parameters \"%@\"", parameters]];
+		[arguments addObject:cvarArgument];
 
 		for (int i = 1, count = Args->NumArgs(); i < count; ++i)
 		{