3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-26 23:01:05 +08:00
Code Issues Projects Releases Wiki Activity

Roll crashpad/third_party/mini_chromium/mini_chromium/ 707c87bd2..98bbdbe49 (1 commit) + changes

Browse Source 
707c87bd25..98bbdbe49f

$ git log 707c87bd2..98bbdbe49 --date=short --no-merges --format='%ad %ae %s'
2023-10-27 avi Update ScopedTypeRef

Created with:
  roll-dep crashpad/third_party/mini_chromium/mini_chromium

---

In addition, change implicit unwrapping of ScopedCFTypeRef to be
explicit.

Bug: chromium:1495438, chromium:1495439
Change-Id: I47dd12f94f71caaad74cf23be9da9d03a59772db
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4984741
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Avi Drissman 2023-10-27 11:57:43 -04:00 committed by Crashpad LUCI CQ
parent 59fc31ce00
commit 188ad79298
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -47,7 +47,7 @@ deps = {
'9719c1e1e676814c456b55f5f070eabad6709d31', '9719c1e1e676814c456b55f5f070eabad6709d31',
'crashpad/third_party/mini_chromium/mini_chromium': 'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' + Var('chromium_git') + '/chromium/mini_chromium@' +
'707c87bd258dcb8c19be8a69e92efae9fd1b51ad', '98bbdbe49f4ac26318f88aa7e84296a3da22f7d8',
'crashpad/third_party/libfuzzer/src': 'crashpad/third_party/libfuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
'fda403cf93ecb8792cb1d061564d89a6553ca020', 'fda403cf93ecb8792cb1d061564d89a6553ca020',

2
util/mac/launchd.mm
View File

@ -133,7 +133,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
base::apple::ScopedCFTypeRef<CFStringRef> type_name_cf( base::apple::ScopedCFTypeRef<CFStringRef> type_name_cf(
CFCopyTypeIDDescription(type_id_cf)); CFCopyTypeIDDescription(type_id_cf));
DLOG(ERROR) << "unable to convert CFTypeID " << 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; return data_launch;

27
util/mac/mac_util.cc
View File

@ -168,7 +168,7 @@ std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry,
CFStringRef key) { CFStringRef key) {
base::apple::ScopedCFTypeRef<CFTypeRef> property( base::apple::ScopedCFTypeRef<CFTypeRef> property(
IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0)); IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0));
CFDataRef data = base::apple::CFCast<CFDataRef>(property); CFDataRef data = base::apple::CFCast<CFDataRef>(property.get());
if (data && CFDataGetLength(data) > 0) { if (data && CFDataGetLength(data) > 0) {
return reinterpret_cast<const char*>(CFDataGetBytePtr(data)); return reinterpret_cast<const char*>(CFDataGetBytePtr(data));
} }
@ -244,8 +244,9 @@ bool MacOSVersionComponents(int* major,
bool success = true; bool success = true;
CFStringRef version_cf = base::apple::CFCast<CFStringRef>( CFStringRef version_cf =
TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductVersionKey)); base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
dictionary.get(), _kCFSystemVersionProductVersionKey));
std::string version; std::string version;
if (!version_cf) { if (!version_cf) {
LOG(ERROR) << "version_cf not found"; LOG(ERROR) << "version_cf not found";
@ -264,8 +265,9 @@ bool MacOSVersionComponents(int* major,
} }
} }
CFStringRef build_cf = base::apple::CFCast<CFStringRef>( CFStringRef build_cf =
TryCFDictionaryGetValue(dictionary, _kCFSystemVersionBuildVersionKey)); base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
dictionary.get(), _kCFSystemVersionBuildVersionKey));
if (!build_cf) { if (!build_cf) {
LOG(ERROR) << "build_cf not found"; LOG(ERROR) << "build_cf not found";
success = false; success = false;
@ -273,8 +275,9 @@ bool MacOSVersionComponents(int* major,
build->assign(base::SysCFStringRefToUTF8(build_cf)); build->assign(base::SysCFStringRefToUTF8(build_cf));
} }
CFStringRef product_cf = base::apple::CFCast<CFStringRef>( CFStringRef product_cf =
TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductNameKey)); base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
dictionary.get(), _kCFSystemVersionProductNameKey));
std::string product; std::string product;
if (!product_cf) { if (!product_cf) {
LOG(ERROR) << "product_cf not found"; 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. // This key is not required, and in fact is normally not present.
CFStringRef extra_cf = CFStringRef extra_cf =
base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue( base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
dictionary, _kCFSystemVersionProductVersionExtraKey)); dictionary.get(), _kCFSystemVersionProductVersionExtraKey));
std::string extra; std::string extra;
if (extra_cf) { if (extra_cf) {
extra = base::SysCFStringRefToUTF8(extra_cf); extra = base::SysCFStringRefToUTF8(extra_cf);
@ -313,8 +316,8 @@ void MacModelAndBoard(std::string* model, std::string* board_id) {
IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceGetMatchingService(kIOMasterPortDefault,
IOServiceMatching("IOPlatformExpertDevice"))); IOServiceMatching("IOPlatformExpertDevice")));
if (platform_expert) { if (platform_expert) {
model->assign( model->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(),
IORegistryEntryDataPropertyAsString(platform_expert, CFSTR("model"))); CFSTR("model")));
#if defined(ARCH_CPU_X86_FAMILY) #if defined(ARCH_CPU_X86_FAMILY)
CFStringRef kBoardProperty = CFSTR("board-id"); CFStringRef kBoardProperty = CFSTR("board-id");
#elif defined(ARCH_CPU_ARM64) #elif defined(ARCH_CPU_ARM64)
@ -324,8 +327,8 @@ void MacModelAndBoard(std::string* model, std::string* board_id) {
// alternative. // alternative.
CFStringRef kBoardProperty = CFSTR("target-type"); CFStringRef kBoardProperty = CFSTR("target-type");
#endif #endif
board_id->assign( board_id->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(),
IORegistryEntryDataPropertyAsString(platform_expert, kBoardProperty)); kBoardProperty));
} else { } else {
model->clear(); model->clear();
board_id->clear(); board_id->clear();