Security-58286.1.32.tar.gz

[apple/security.git] / SecurityTool / smartcards.m

diff --git a/SecurityTool/smartcards.m b/SecurityTool/smartcards.m
index 2bbd44444b064a25b74e1d104d023473c5a714be..fb934a18ef2700d1f7bce944c8b95d75e96cc27b 100644 (file)
--- a/SecurityTool/smartcards.m
+++ b/SecurityTool/smartcards.m
@@ -11,9 +11,8 @@ const CFStringRef kTKDisabledTokensPreferencesKey  = CFSTR("DisabledTokens");
 
 static void listDisabledTokens() {
     id value = (__bridge_transfer id)CFPreferencesCopyValue(kTKDisabledTokensPreferencesKey, kTKSmartCardPreferencesDomain, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);
 
 static void listDisabledTokens() {
     id value = (__bridge_transfer id)CFPreferencesCopyValue(kTKDisabledTokensPreferencesKey, kTKSmartCardPreferencesDomain, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);

-    if (![value isKindOfClass:NSArray.class])
+    if (value && ![value isKindOfClass:NSArray.class])

         return;
         return;

-

     NSArray *disabledTokens = (NSArray*)value;
     for (id tokenName in disabledTokens) {
         if ([tokenName isKindOfClass:NSString.class]) {
     NSArray *disabledTokens = (NSArray*)value;
     for (id tokenName in disabledTokens) {
         if ([tokenName isKindOfClass:NSString.class]) {


@@ -24,7 +23,7 @@ static void listDisabledTokens() {
 
 static void disable(const char *tokenToDisable) {
     id value = (__bridge_transfer id)CFPreferencesCopyValue(kTKDisabledTokensPreferencesKey, kTKSmartCardPreferencesDomain, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);
 
 static void disable(const char *tokenToDisable) {
     id value = (__bridge_transfer id)CFPreferencesCopyValue(kTKDisabledTokensPreferencesKey, kTKSmartCardPreferencesDomain, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);

-    if (![value isKindOfClass:NSArray.class])
+    if (value && ![value isKindOfClass:NSArray.class])

         return;
     NSMutableArray *disabledTokens = [NSMutableArray arrayWithArray:value];
     NSString *tokenName = [NSString stringWithUTF8String:tokenToDisable];
         return;
     NSMutableArray *disabledTokens = [NSMutableArray arrayWithArray:value];
     NSString *tokenName = [NSString stringWithUTF8String:tokenToDisable];


@@ -40,9 +39,8 @@ static void disable(const char *tokenToDisable) {
 
 static void enable(const char *tokenToEnable) {
     id value = (__bridge_transfer id)CFPreferencesCopyValue(kTKDisabledTokensPreferencesKey, kTKSmartCardPreferencesDomain, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);
 
 static void enable(const char *tokenToEnable) {
     id value = (__bridge_transfer id)CFPreferencesCopyValue(kTKDisabledTokensPreferencesKey, kTKSmartCardPreferencesDomain, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);

-    if (![value isKindOfClass:NSArray.class])
+    if (value && ![value isKindOfClass:NSArray.class])

         return;
         return;

-

     NSString *tokenName = [NSString stringWithUTF8String:tokenToEnable];
     NSMutableArray *disabledTokens = [NSMutableArray arrayWithArray:value];
     if ([disabledTokens containsObject:tokenName]) {
     NSString *tokenName = [NSString stringWithUTF8String:tokenToEnable];
     NSMutableArray *disabledTokens = [NSMutableArray arrayWithArray:value];
     if ([disabledTokens containsObject:tokenName]) {