Merge pull request #88694 from bruvzg/str_checks

[macOS] Add null checks for `NSString stringWithUTF8String`.
godotengine · Feb 25, 2024 · a030031 · a030031
2 parents e69cdf3 + d2e0544
commit a030031
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/platform/macos/dir_access_macos.mm b/platform/macos/dir_access_macos.mm
@@ -41,9 +41,10 @@
 
 String DirAccessMacOS::fix_unicode_name(const char *p_name) const {
 	String fname;
-	NSString *nsstr = [[NSString stringWithUTF8String:p_name] precomposedStringWithCanonicalMapping];
-
-	fname.parse_utf8([nsstr UTF8String]);
+	if (p_name != nullptr) {
+		NSString *nsstr = [[NSString stringWithUTF8String:p_name] precomposedStringWithCanonicalMapping];
+		fname.parse_utf8([nsstr UTF8String]);
+	}
 
 	return fname;
 }

diff --git a/platform/macos/godot_application_delegate.mm b/platform/macos/godot_application_delegate.mm
@@ -125,7 +125,8 @@ - (void)system_theme_changed:(NSNotification *)notification {
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notice {
 	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-	NSString *nsbundleid_env = [NSString stringWithUTF8String:getenv("__CFBundleIdentifier")];
+	const char *bundled_id = getenv("__CFBundleIdentifier");
+	NSString *nsbundleid_env = [NSString stringWithUTF8String:(bundled_id != nullptr) ? bundled_id : ""];
 	NSString *nsbundleid = [[NSBundle mainBundle] bundleIdentifier];
 	if (nsappname == nil || isatty(STDOUT_FILENO) || isatty(STDIN_FILENO) || isatty(STDERR_FILENO) || ![nsbundleid isEqualToString:nsbundleid_env]) {
 		// If the executable is started from terminal or is not bundled, macOS WindowServer won't register and activate app window correctly (menu and title bar are grayed out and input ignored).