10.6 runtime compatibility for MachOImageReader test

util/mac/mach_o_image_reader_test.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 263 matching lines @@
   EXPECT_FALSE(
       actual_image->GetSectionByName("NoSuchSegment", "NoSuchSection", NULL));
 
   // Make sure that there’s a __TEXT segment so that this can do a valid test of
   // a section that doesn’t exist within a segment that does.
   EXPECT_TRUE(actual_image->GetSegmentByName(SEG_TEXT));
   EXPECT_FALSE(actual_image->GetSectionByName(SEG_TEXT, "NoSuchSection", NULL));
 
   // Similarly, make sure that a section name that exists in one segment isn’t
   // accidentally found during a lookup for that section in a different segment.
-  EXPECT_TRUE(actual_image->GetSectionByName(SEG_TEXT, SECT_TEXT, NULL));
+  //
+  // If the image has no sections (unexpected), then any section lookup should
+  // fail, and these initial values of test_segment and test_section are fine
+  // for the EXPECT_FALSE checks on GetSectionByName() below.
+  std::string test_segment = SEG_DATA;
+  std::string test_section = SECT_TEXT;
+
+  const process_types::section* section =
+      actual_image->GetSectionAtIndex(1, NULL, NULL);
+  if (section) {
+    // Use the name of the first section in the image as the section that
+    // shouldn’t appear in a different segment. If the first section is in the
+    // __TEXT segment (as it is normally), then a section by the same name
+    // wouldn’t be expected in the __DATA segment. But if the first section is
+    // in any other segment, then it wouldn’t be expected in the __TEXT segment.
+    if (MachOImageSegmentReader::SegmentNameString(section->segname) ==
+        SEG_TEXT) {

[Robert Sesek, 2014/09/22 16:35:47]

nit: indent +4

+      test_segment = SEG_DATA;
+    } else {
+      test_segment = SEG_TEXT;
+    }
+    test_section =
+        MachOImageSegmentReader::SectionNameString(section->sectname);
+
+    // It should be possible to look up the first section by name.
+    EXPECT_EQ(section, actual_image->GetSectionByName(
+        section->segname, section->sectname, NULL));
+  }
   EXPECT_FALSE(
-      actual_image->GetSectionByName("NoSuchSegment", SECT_TEXT, NULL));
-  EXPECT_FALSE(actual_image->GetSectionByName(SEG_DATA, SECT_TEXT, NULL));
+      actual_image->GetSectionByName("NoSuchSegment", test_section, NULL));
+  EXPECT_FALSE(
+      actual_image->GetSectionByName(test_segment, test_section, NULL));
 
   // The __LINKEDIT segment normally does exist but doesn’t have any sections.
   EXPECT_FALSE(
       actual_image->GetSectionByName(SEG_LINKEDIT, "NoSuchSection", NULL));
   EXPECT_FALSE(actual_image->GetSectionByName(SEG_LINKEDIT, SECT_TEXT, NULL));
 }
 
 // In some cases, the expected slide value for an image is unknown, because no
 // reasonable API to return it is provided. When this happens, use kSlideUnknown
 // to avoid checking the actual slide value against anything.
@@ skipping 327 matching lines @@
       expected_uuid.InitializeFromBytes(dyld_image->imageUUID);
       UUID actual_uuid;
       image_reader.UUID(&actual_uuid);
       EXPECT_EQ(expected_uuid, actual_uuid);
     }
   }
 #endif
 }
 
 }  // namespace