win: Add more memory regions to gathering of PEB

snapshot/win/process_snapshot_win.h

 // 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 22 matching lines @@
 #include "snapshot/system_snapshot.h"
 #include "snapshot/thread_snapshot.h"
 #include "snapshot/win/exception_snapshot_win.h"
 #include "snapshot/win/memory_snapshot_win.h"
 #include "snapshot/win/module_snapshot_win.h"
 #include "snapshot/win/system_snapshot_win.h"
 #include "snapshot/win/thread_snapshot_win.h"
 #include "util/misc/initialization_state_dcheck.h"
 #include "util/misc/uuid.h"
 #include "util/win/address_types.h"
+#include "util/win/process_structs.h"
 #include "util/stdlib/pointer_container.h"
 
 namespace crashpad {
 
 //! \brief A ProcessSnapshot of a running (or crashed) process running on a
 //!     Windows system.
 class ProcessSnapshotWin final : public ProcessSnapshot {
  public:
   ProcessSnapshotWin();
   ~ProcessSnapshotWin() override;
@@ skipping 74 matching lines @@
   const ExceptionSnapshot* Exception() const override;
   std::vector<const MemorySnapshot*> ExtraMemory() const override;
 
  private:
   // Initializes threads_ on behalf of Initialize().
   void InitializeThreads();
 
   // Initializes modules_ on behalf of Initialize().
   void InitializeModules();
 
+  // Initializes peb_memory_ on behalf of Initialize().
+  template <class Traits>
+  void InitializePebData();
+
+  internal::MemorySnapshotWin* CreateMemorySnapshot(WinVMAddress address,
+                                                    WinVMAddress size);
+  template <class Traits>

[Mark Mentovai, 2015/09/25 21:10:16]

Blank line before this.

[scottmg, 2015/09/25 22:52:25]

Done.

+  internal::MemorySnapshotWin* CreateMemorySnapshotForUNICODE_STRING(
+      const process_types::UNICODE_STRING<Traits>& us) {
+    return CreateMemorySnapshot(us.Buffer, us.MaximumLength);

[Mark Mentovai, 2015/09/25 21:10:17]

Length instead of MaximumLength? We don’t need to capture what’s not currently
valid.

Probably it should be std::min(us.Length + sizeof(us.Buffer[0]),
us.MaximumLength), to ensure that we’re capturing the memory from the trailing
NUL character (if there is one) without overrunning the buffer.

I can’t think of a good reason to inline this in the header, it’s just more of
an opportunity to have to rebuild .cc files that depend on
process_snapshot_win.h when this implementation changes.

[scottmg, 2015/09/25 22:52:25]

Done. (Can't use us.Buffer[0] because it's Traits::Pointer)

+  }
+
   internal::SystemSnapshotWin system_;
-  internal::MemorySnapshotWin peb_;
+  PointerVector<internal::MemorySnapshotWin> peb_memory_;
   PointerVector<internal::ThreadSnapshotWin> threads_;
   PointerVector<internal::ModuleSnapshotWin> modules_;
   scoped_ptr<internal::ExceptionSnapshotWin> exception_;
   ProcessReaderWin process_reader_;
   UUID report_id_;
   UUID client_id_;
   std::map<std::string, std::string> annotations_simple_map_;
   timeval snapshot_time_;
   InitializationStateDcheck initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessSnapshotWin);
 };
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_SNAPSHOT_WIN_PROCESS_SNAPSHOT_WIN_H_