diff options
| author | Mike Frysinger <vapier@chromium.org> | 2017-03-24 21:35:26 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2017-03-25 01:37:18 +0000 |
| commit | 7a8374fc4c199ecf8f355a536fe26fccfe0faaf0 (patch) | |
| tree | d80bc1e0e2643917a35c28c347ab43a999af231b /src/processor | |
| parent | minidump_dump: dump stack memory like hexdump (diff) | |
| download | breakpad-7a8374fc4c199ecf8f355a536fe26fccfe0faaf0.tar.xz | |
minidump_dump: fix up init paths
Fix some build & test failures in the previous minidump_dump code.
BUG=chromium:598947
Change-Id: Ia8fce453265167368de96747a8a92af930e78245
Reviewed-on: https://chromium-review.googlesource.com/458881
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'src/processor')
| -rw-r--r-- | src/processor/minidump.cc | 6 | ||||
| -rw-r--r-- | src/processor/minidump_dump.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index 7fae7fb7..430d49d9 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -1202,7 +1202,7 @@ MinidumpMemoryRegion::MinidumpMemoryRegion(Minidump* minidump) : MinidumpObject(minidump), descriptor_(NULL), memory_(NULL) { - hexdump_width_ = minidump->HexdumpMode(); + hexdump_width_ = minidump_ ? minidump_->HexdumpMode() : 0; hexdump_ = hexdump_width_ != 0; } @@ -4773,7 +4773,9 @@ Minidump::Minidump(istream& stream) path_(), stream_(&stream), swap_(false), - valid_(false) { + valid_(false), + hexdump_(false), + hexdump_width_(0) { } Minidump::~Minidump() { diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc index a21ae5a7..4d916276 100644 --- a/src/processor/minidump_dump.cc +++ b/src/processor/minidump_dump.cc @@ -55,7 +55,7 @@ using google_breakpad::MinidumpBreakpadInfo; struct Options { Options() - : minidumpPath(), hexdump(false), hexdump_width(hexdump_width) {} + : minidumpPath(), hexdump(false), hexdump_width(16) {} string minidumpPath; bool hexdump; |