Tolerate weird cl_kernels modules on Mac OS X 10.11

snapshot/mac/mach_o_image_segment_reader.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 103 matching lines @@
         SegmentAndSectionNameString(section.segname, section.sectname);
 
     std::string section_info = base::StringPrintf(", section %s %zu/%zu%s",
                                                   section_full_name.c_str(),
                                                   section_index,
                                                   sections_.size(),
                                                   load_command_info.c_str());
 
     if (section_segment_name != segment_name) {
       // cl_kernels modules (for OpenCL) aren’t ld output, and they’re formatted
-      // incorrectly on Mac OS X 10.10. They have a single __TEXT segment, but
-      // one of the sections within it claims to belong to the __LD segment.
+      // incorrectly on OS X 10.10 and 10.11. They have a single __TEXT segment,
+      // but one of the sections within it claims to belong to the __LD segment.
       // This mismatch shouldn’t happen. This errant section also has the
       // S_ATTR_DEBUG flag set, which shouldn’t happen unless all of the other
       // sections in the segment also have this bit set (they don’t). These odd
       // sections are reminiscent of unwind information stored in MH_OBJECT
       // images, although cl_kernels images claim to be MH_BUNDLE. Because at
       // least one cl_kernels module will commonly be found in a process, and
       // sometimes more will be, tolerate this quirk.
       //
       // https://openradar.appspot.com/20239912
-      if (!(file_type == MH_BUNDLE &&
-            module_name == "cl_kernels" &&
-            MacOSXMinorVersion() == 10 &&
+      bool ok = false;
+      if (file_type == MH_BUNDLE && module_name == "cl_kernels") {
+        int mac_os_x_minor_version = MacOSXMinorVersion();
+        if ((mac_os_x_minor_version == 10 || mac_os_x_minor_version == 11) &&
             segment_name == SEG_TEXT &&
             section_segment_name == "__LD" &&
             section_name == "__compact_unwind" &&
-            (section.flags & S_ATTR_DEBUG))) {
+            (section.flags & S_ATTR_DEBUG)) {
+          ok = true;
+        }
+      }
+
+      if (!ok) {
         LOG(WARNING) << "section.segname incorrect in segment " << segment_name
                      << section_info;
         return false;
       }
     }
 
     CheckedMachAddressRange section_range(
         process_reader->Is64Bit(), section.addr, section.size);
     if (!section_range.IsValid()) {
       LOG(WARNING) << base::StringPrintf(
@@ skipping 140 matching lines @@
 }
 
 void MachOImageSegmentReader::SetSlide(mach_vm_size_t slide) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_slide_);
   slide_ = slide;
   INITIALIZATION_STATE_SET_VALID(initialized_slide_);
 }
 
 }  // namespace crashpad