index 0 beyond bounds for empty NSArray fix

Author: benbaker76

Hackintool.xcodeproj/project.pbxproj

@@ -715,7 +715,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0374;
+				CURRENT_PROJECT_VERSION = 0375;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -730,7 +730,7 @@
 				INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 3.7.4;
+				MARKETING_VERSION = 3.7.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -751,7 +751,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0374;
+				CURRENT_PROJECT_VERSION = 0375;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -766,7 +766,7 @@
 				INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 3.7.4;
+				MARKETING_VERSION = 3.7.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Hackintool.xcodeproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate

@@ -2058,7 +2058,25 @@ - (BOOL)getNativeBluetoothDeviceInfo:(NSMutableDictionary *)bluetoothDeviceDicti
 		return NO;
 	}
 
-	NSDictionary *controllerDictionary = [[[[bluetoothArray objectAtIndex:0] objectForKey:@"_items"] objectAtIndex:0] objectForKey:@"controller_properties"];
+	if ([bluetoothArray count] == 0)
+		return NO;
+	
+	NSDictionary *controllerDictionary = [bluetoothArray objectAtIndex:0];
+	
+	if (controllerDictionary == nil)
+		return NO;
+	
+	NSArray *controllerArray = [controllerDictionary objectForKey:@"_items"];
+	
+	if (controllerArray == nil || [controllerArray count] == 0)
+		return NO;
+	
+	controllerDictionary = [controllerArray objectAtIndex:0];
+	
+	if (controllerDictionary == nil)
+		return NO;
+	
+	controllerDictionary = [controllerDictionary objectForKey:@"controller_properties"];
 
 	if (controllerDictionary == nil)
 		return NO;
@@ -10718,7 +10736,25 @@ - (BOOL)createWindowsBluetoothRegistryFile
 				return NO;
 			}
 
-			bluetoothArray = [[[[bluetoothArray objectAtIndex:0] objectForKey:@"_items"] objectAtIndex:0] objectForKey:@"devices_list"];
+			if ([bluetoothArray count] == 0)
+				return NO;
+			
+			NSDictionary *controllerDictionary = [bluetoothArray objectAtIndex:0];
+			
+			if (controllerDictionary == nil)
+				return NO;
+			
+			NSArray *controllerArray = [controllerDictionary objectForKey:@"_items"];
+			
+			if (controllerArray == nil || [controllerArray count] == 0)
+				return NO;
+			
+			controllerDictionary = [controllerArray objectAtIndex:0];
+			
+			if (controllerDictionary == nil)
+				return NO;
+			
+			bluetoothArray = [controllerDictionary objectForKey:@"devices_list"];
 
 			if (bluetoothArray == nil)
 				return NO;

Hackintool/AppDelegate.m

@@ -1239,6 +1239,18 @@ bool getIORegBluetoothArray(NSMutableArray **propertyArray)
 				CFRelease(usbProductString);
 			}
 
+			CFNumberRef builtIn = nil;
+
+			if (CFDictionaryGetValueIfPresent(parentProperties, CFSTR("Built-in"), (const void **)&builtIn))
+			{
+				if ([(__bridge NSNumber *)builtIn boolValue])
+				{
+					// Built-in
+				}
+				
+				CFRelease(builtIn);
+			}
+			
 			if (skipDevice)
 				continue;