| Index: chrome/installer/mac/app/Unpacker.m
|
| diff --git a/chrome/installer/mac/app/Unpacker.m b/chrome/installer/mac/app/Unpacker.m
|
| index 4c396afbcad5ed03917e9c8cfa64c94782a828ee..d5b281d693089341484d5728dc3679d04d40141b 100644
|
| --- a/chrome/installer/mac/app/Unpacker.m
|
| +++ b/chrome/installer/mac/app/Unpacker.m
|
| @@ -27,7 +27,7 @@
|
| static void eject_callback(DADiskRef disk,
|
| DADissenterRef dissenter,
|
| void* context) {
|
| - Unpacker* unpacker = (__bridge Unpacker*)context;
|
| + Unpacker* unpacker = (__bridge_transfer Unpacker*)context;
|
| [unpacker didFinishEjectingDisk:disk withDissenter:dissenter];
|
| }
|
|
|
| @@ -97,19 +97,6 @@ static void unmount_callback(DADiskRef disk,
|
| toURL:temporaryDiskImageURL
|
| error:nil];
|
|
|
| - SecStaticCodeRef diskStaticCode;
|
| - SecRequirementRef diskRequirement;
|
| - SecStaticCodeCreateWithPath((CFURLRef)CFBridgingRetain(temporaryDiskImageURL),
|
| - kSecCSDefaultFlags, &diskStaticCode);
|
| - // TODO: what requirement goes in here??
|
| - SecRequirementCreateWithString((CFStringRef) @"", kSecCSDefaultFlags,
|
| - &diskRequirement);
|
| - if (SecStaticCodeCheckValidity(diskStaticCode, kSecCSDefaultFlags,
|
| - diskRequirement) != errSecSuccess) {
|
| - // TODO: add in more strict error handling
|
| - NSLog(@"verification failed");
|
| - }
|
| -
|
| NSString* path = @"/usr/bin/hdiutil";
|
| NSArray* args = @[
|
| @"attach", temporaryDiskImageURL, @"-nobrowse", @"-noverify",
|
| @@ -150,7 +137,7 @@ static void unmount_callback(DADiskRef disk,
|
|
|
| DADiskUnmount(whole_disk,
|
| kDADiskUnmountOptionWhole | kDADiskUnmountOptionForce,
|
| - unmount_callback, (__bridge void*)self);
|
| + unmount_callback, (__bridge_retained void*)self);
|
|
|
| CFRelease(whole_disk);
|
| CFRelease(child_disk);
|
|
|