From ea6861b1eb32735330bcee060866721d5fab4467 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Thu, 14 May 2020 16:31:15 -0700 Subject: [PATCH] [AltServer] Uses empty strings in place of nil error messages --- AltServer/Devices/ALTDeviceManager.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AltServer/Devices/ALTDeviceManager.mm b/AltServer/Devices/ALTDeviceManager.mm index 8055b594..38f1fefd 100644 --- a/AltServer/Devices/ALTDeviceManager.mm +++ b/AltServer/Devices/ALTDeviceManager.mm @@ -1160,7 +1160,7 @@ void ALTDeviceManagerUpdateStatus(plist_t command, plist_t status, void *uuid) { if (code != 0 || name != NULL) { - NSLog(@"Error installing app. %@ (%@). %@", @(code), @(name), @(description)); + NSLog(@"Error installing app. %@ (%@). %@", @(code), @(name ?: ""), @(description ?: "")); NSError *error = nil; @@ -1170,14 +1170,14 @@ void ALTDeviceManagerUpdateStatus(plist_t command, plist_t status, void *uuid) } else { - NSString *errorName = [NSString stringWithCString:name encoding:NSUTF8StringEncoding]; + NSString *errorName = [NSString stringWithCString:name ?: "" encoding:NSUTF8StringEncoding]; if ([errorName isEqualToString:@"DeviceOSVersionTooLow"]) { error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorUnsupportediOSVersion userInfo:nil]; } else { - NSError *underlyingError = [NSError errorWithDomain:AltServerInstallationErrorDomain code:code userInfo:@{NSLocalizedDescriptionKey: @(description)}]; + NSError *underlyingError = [NSError errorWithDomain:AltServerInstallationErrorDomain code:code userInfo:@{NSLocalizedDescriptionKey: @(description ?: "")}]; error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorInstallationFailed userInfo:@{NSUnderlyingErrorKey: underlyingError}]; } }