diff --git a/DEPS b/DEPS index 85f57ed2..909ef7dc 100644 --- a/DEPS +++ b/DEPS @@ -47,7 +47,7 @@ deps = { '9719c1e1e676814c456b55f5f070eabad6709d31', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - '707c87bd258dcb8c19be8a69e92efae9fd1b51ad', + '98bbdbe49f4ac26318f88aa7e84296a3da22f7d8', 'crashpad/third_party/libfuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + 'fda403cf93ecb8792cb1d061564d89a6553ca020', diff --git a/util/mac/launchd.mm b/util/mac/launchd.mm index d295ffc6..e2ced32d 100644 --- a/util/mac/launchd.mm +++ b/util/mac/launchd.mm @@ -133,7 +133,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) { base::apple::ScopedCFTypeRef type_name_cf( CFCopyTypeIDDescription(type_id_cf)); DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" - << base::SysCFStringRefToUTF8(type_name_cf) << ")"; + << base::SysCFStringRefToUTF8(type_name_cf.get()) << ")"; } return data_launch; diff --git a/util/mac/mac_util.cc b/util/mac/mac_util.cc index c74fbf36..cef23872 100644 --- a/util/mac/mac_util.cc +++ b/util/mac/mac_util.cc @@ -168,7 +168,7 @@ std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry, CFStringRef key) { base::apple::ScopedCFTypeRef property( IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0)); - CFDataRef data = base::apple::CFCast(property); + CFDataRef data = base::apple::CFCast(property.get()); if (data && CFDataGetLength(data) > 0) { return reinterpret_cast(CFDataGetBytePtr(data)); } @@ -244,8 +244,9 @@ bool MacOSVersionComponents(int* major, bool success = true; - CFStringRef version_cf = base::apple::CFCast( - TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductVersionKey)); + CFStringRef version_cf = + base::apple::CFCast(TryCFDictionaryGetValue( + dictionary.get(), _kCFSystemVersionProductVersionKey)); std::string version; if (!version_cf) { LOG(ERROR) << "version_cf not found"; @@ -264,8 +265,9 @@ bool MacOSVersionComponents(int* major, } } - CFStringRef build_cf = base::apple::CFCast( - TryCFDictionaryGetValue(dictionary, _kCFSystemVersionBuildVersionKey)); + CFStringRef build_cf = + base::apple::CFCast(TryCFDictionaryGetValue( + dictionary.get(), _kCFSystemVersionBuildVersionKey)); if (!build_cf) { LOG(ERROR) << "build_cf not found"; success = false; @@ -273,8 +275,9 @@ bool MacOSVersionComponents(int* major, build->assign(base::SysCFStringRefToUTF8(build_cf)); } - CFStringRef product_cf = base::apple::CFCast( - TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductNameKey)); + CFStringRef product_cf = + base::apple::CFCast(TryCFDictionaryGetValue( + dictionary.get(), _kCFSystemVersionProductNameKey)); std::string product; if (!product_cf) { LOG(ERROR) << "product_cf not found"; @@ -286,7 +289,7 @@ bool MacOSVersionComponents(int* major, // This key is not required, and in fact is normally not present. CFStringRef extra_cf = base::apple::CFCast(TryCFDictionaryGetValue( - dictionary, _kCFSystemVersionProductVersionExtraKey)); + dictionary.get(), _kCFSystemVersionProductVersionExtraKey)); std::string extra; if (extra_cf) { extra = base::SysCFStringRefToUTF8(extra_cf); @@ -313,8 +316,8 @@ void MacModelAndBoard(std::string* model, std::string* board_id) { IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"))); if (platform_expert) { - model->assign( - IORegistryEntryDataPropertyAsString(platform_expert, CFSTR("model"))); + model->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(), + CFSTR("model"))); #if defined(ARCH_CPU_X86_FAMILY) CFStringRef kBoardProperty = CFSTR("board-id"); #elif defined(ARCH_CPU_ARM64) @@ -324,8 +327,8 @@ void MacModelAndBoard(std::string* model, std::string* board_id) { // alternative. CFStringRef kBoardProperty = CFSTR("target-type"); #endif - board_id->assign( - IORegistryEntryDataPropertyAsString(platform_expert, kBoardProperty)); + board_id->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(), + kBoardProperty)); } else { model->clear(); board_id->clear();