mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 00:32:35 +08:00
6083a2706d
The system’s crashreporter_annotations_t structure was always present as version 4 since Mac OS X 10.7. In OS X 10.11, it is now present as version 5. It has also grown from 56 to 64 bytes per otool examination of CoreFoundation’s __DATA,__crash_info section. The extra 8 bytes are presumed to be a new field at the end of the structure, although this is not confirmed. The existing MachOImageAnnotationsReader.CrashAbort test only validated that the “message” field in crashreporter_annotations_t was recovered correctly, but MachOImageAnnotationsReader::ReadCrashReporterClientAnnotations() also recovers the “message2” field. A new test, MachOImageAnnotationsReader.CrashModuleInitialization, is added to ensure that the “messgae2” field can be recovered properly. This change will resolve warnings such as: [pid:tid:yyyymmdd,hhmmss.uuuuuu:WARNING mach_o_image_annotations_reader.cc:82] unexpected crash info version 5 in /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation BUG=crashpad:40 TEST=crashpad_snapshot_test MachOImageAnnotationsReader.CrashAbort, MachOImageAnnotationsReader.CrashModuleInitialization R=rsesek@chromium.org Review URL: https://codereview.chromium.org/1277513003 .