Nice bug fix. Ouch. Uninitialized values could assign shortcuts randomly. Where was the clang analyzer when I needed it?

Author: jerrykrinock

Diff for: SSYShortcutActuator.h

@@ -1,5 +1,5 @@
 #import <Cocoa/Cocoa.h>
-#import "SRCommon.h"  // for KeyCombo
+#import "SRCommon.h"  // for KeyCombo, also this imports <Carbon/Carbon.h>
 
 extern NSString* const SSYShortcutActuatorDidNonemptyNotification ;
 extern NSString* const SSYShortcutActuatorDidEmptyNotification ;

Diff for: SSYShortcutActuator.m

@@ -483,6 +483,11 @@ + (SSYShortcutActuator*)sharedActuator {
 
 - (KeyCombo)keyComboForSelectorName:(NSString*)selectorName {
 	KeyCombo keyCombo ;
+    // Fixed in BookMacster 1.18.0 so garbage values are not returned if
+    // shortcutInfos (below) comes up nil from user defaults.
+    keyCombo.code = -1 ;
+    keyCombo.flags = 0 ;
+    
 	NSUserDefaults* sud = [NSUserDefaults standardUserDefaults] ;
 	// Use -respondsToSelector: since one should never trust anything
 	// that comes out of user defaults
@@ -496,21 +501,11 @@ - (KeyCombo)keyComboForSelectorName:(NSString*)selectorName {
 			if ([number respondsToSelector:@selector(integerValue)]) {
 				keyCombo.code = [number integerValue] ;
 			}
-			else {
-				keyCombo.code = -1 ;
-			}
 
 			number = [shortcutInfo objectForKey:constKeyModifierFlags] ;
 			if ([number respondsToSelector:@selector(unsignedIntegerValue)]) {
 				keyCombo.flags = [number unsignedIntegerValue] ;
 			}
-			else {
-				keyCombo.flags = 0 ;
-			}
-		}
-		else {
-			keyCombo.code = -1 ;
-			keyCombo.flags = 0 ;
 		}
 	}