Merge pull request #2088 from saagarjha/master

Avoid strdup(NULL) if hostname override isn't set
ish-app · Apr 23, 2023 · bd8f1a5 · bd8f1a5
2 parents 5850685 + edc4671
commit bd8f1a5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/AppDelegate.m b/app/AppDelegate.m
@@ -35,8 +35,6 @@
 @interface AppDelegate ()
 
 @property BOOL exiting;
-@property NSString *ishVersion;
-@property NSString *unameHostname;
 @property SCNetworkReachabilityRef reachability;
 
 @end
@@ -288,7 +286,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     proc_ish_version = strdup(ishVersion.UTF8String);
     // this defaults key is set when taking app store screenshots
     extern const char *uname_hostname_override;
-    uname_hostname_override = strdup([NSUserDefaults.standardUserDefaults stringForKey:@"hostnameOverride"].UTF8String);
+    NSString *hostnameOverride = [NSUserDefaults.standardUserDefaults stringForKey:@"hostnameOverride"];
+    if (hostnameOverride) {
+        uname_hostname_override = strdup(uname_hostname_override);
+    }
 #endif
 
     [UserPreferences.shared observe:@[@"shouldDisableDimming"] options:NSKeyValueObservingOptionInitial