win: Handle binary with embedded CodeView debug record

snapshot/win/pe_image_reader.cc

 // Copyright 2015 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 158 matching lines @@
     if (!CheckedReadMemory(Address() + data_directory.VirtualAddress + offset,
                            sizeof(debug_directory),
                            &debug_directory)) {
       LOG(WARNING) << "could not read data directory";
       return false;
     }
 
     if (debug_directory.Type != IMAGE_DEBUG_TYPE_CODEVIEW)
       continue;
 
-    if (debug_directory.SizeOfData < sizeof(CodeViewRecordPDB70)) {
-      LOG(WARNING) << "CodeView debug entry of unexpected size";
-      continue;
+    if (debug_directory.AddressOfRawData) {
+      if (debug_directory.SizeOfData < sizeof(CodeViewRecordPDB70)) {
+        LOG(WARNING) << "CodeView debug entry of unexpected size";
+        continue;
+      }
+
+      scoped_ptr<char[]> data(new char[debug_directory.SizeOfData]);
+      if (!CheckedReadMemory(Address() + debug_directory.AddressOfRawData,
+                             debug_directory.SizeOfData,
+                             data.get())) {
+        LOG(WARNING) << "could not read debug directory";
+        return false;
+      }
+
+      if (*reinterpret_cast<DWORD*>(data.get()) !=
+          CodeViewRecordPDB70::kSignature) {
+        LOG(WARNING) << "encountered non-7.0 CodeView debug record";
+        continue;
+      }
+
+      CodeViewRecordPDB70* codeview =
+          reinterpret_cast<CodeViewRecordPDB70*>(data.get());
+      *uuid = codeview->uuid;
+      *age = codeview->age;
+      // This is a NUL-terminated string encoded in the codepage of the system
+      // where the binary was linked. We have no idea what that was, so we just
+      // assume ASCII.
+      *pdbname = std::string(reinterpret_cast<char*>(&codeview->pdb_name[0]));
+      return true;
+    } else if (debug_directory.PointerToRawData) {
+      // This occurs for non-PDB based debug information. We simply ignore these
+      // as we don't expect to encounter modules that will be in this format
+      // for which we'll actually have symbols. See
+      // https://crashpad.chromium.org/bug/47.
     }
-    scoped_ptr<char[]> data(new char[debug_directory.SizeOfData]);
-    if (!CheckedReadMemory(Address() + debug_directory.AddressOfRawData,
-                           debug_directory.SizeOfData,
-                           data.get())) {
-      LOG(WARNING) << "could not read debug directory";
-      return false;
-    }
-
-    if (*reinterpret_cast<DWORD*>(data.get()) !=
-        CodeViewRecordPDB70::kSignature) {
-      // TODO(scottmg): Consider supporting other record types, see
-      // https://crashpad.chromium.org/bug/47.
-      LOG(WARNING) << "encountered non-7.0 CodeView debug record";
-      continue;
-    }
-
-    CodeViewRecordPDB70* codeview =
-        reinterpret_cast<CodeViewRecordPDB70*>(data.get());
-    *uuid = codeview->uuid;
-    *age = codeview->age;
-    // This is a NUL-terminated string encoded in the codepage of the system
-    // where the binary was linked. We have no idea what that was, so we just
-    // assume ASCII.
-    *pdbname = std::string(reinterpret_cast<char*>(&codeview->pdb_name[0]));
-    return true;
   }
 
   return false;
 }
 
 template <class NtHeadersType>
 bool PEImageReader::ReadNtHeaders(NtHeadersType* nt_headers,
                                   WinVMAddress* nt_headers_address) const {
   IMAGE_DOS_HEADER dos_header;
   if (!CheckedReadMemory(Address(), sizeof(IMAGE_DOS_HEADER), &dos_header)) {
@@ skipping 77 matching lines @@
 // Explicit instantiations with the only 2 valid template arguments to avoid
 // putting the body of the function in the header.
 template bool PEImageReader::GetCrashpadInfo<process_types::internal::Traits32>(
     process_types::CrashpadInfo<process_types::internal::Traits32>*
         crashpad_info) const;
 template bool PEImageReader::GetCrashpadInfo<process_types::internal::Traits64>(
     process_types::CrashpadInfo<process_types::internal::Traits64>*
         crashpad_info) const;
 
 }  // namespace crashpad