aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/google_breakpad/processor/minidump.h4
-rw-r--r--src/processor/minidump.cc2
-rw-r--r--src/processor/stackwalker_mips.cc6
-rw-r--r--src/tools/mac/dump_syms/macho_dump.cc9
4 files changed, 11 insertions, 10 deletions
diff --git a/src/google_breakpad/processor/minidump.h b/src/google_breakpad/processor/minidump.h
index 25a871ad..bff38bf3 100644
--- a/src/google_breakpad/processor/minidump.h
+++ b/src/google_breakpad/processor/minidump.h
@@ -836,7 +836,7 @@ class MinidumpUnloadedModuleList : public MinidumpStream,
const MinidumpUnloadedModule*
GetModuleAtIndex(unsigned int index) const override;
const CodeModules* Copy() const override;
- vector<linked_ptr<const CodeModule> > GetShrunkRangeModules() const override;
+ vector<linked_ptr<const CodeModule>> GetShrunkRangeModules() const override;
bool IsModuleShrinkEnabled() const override;
protected:
@@ -850,7 +850,7 @@ class MinidumpUnloadedModuleList : public MinidumpStream,
static const uint32_t kStreamType = MD_UNLOADED_MODULE_LIST_STREAM;
- bool Read(uint32_t expected_size_) override;
+ bool Read(uint32_t expected_size_);
// The largest number of modules that will be read from a minidump. The
// default is 1024.
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index 439bb45f..c9fa4d81 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -3885,7 +3885,7 @@ const CodeModules* MinidumpUnloadedModuleList::Copy() const {
return new BasicCodeModules(this);
}
-vector<linked_ptr<const CodeModule> >
+vector<linked_ptr<const CodeModule>>
MinidumpUnloadedModuleList::GetShrunkRangeModules() const {
return vector<linked_ptr<const CodeModule> >();
}
diff --git a/src/processor/stackwalker_mips.cc b/src/processor/stackwalker_mips.cc
index 65b7c35a..db55d460 100644
--- a/src/processor/stackwalker_mips.cc
+++ b/src/processor/stackwalker_mips.cc
@@ -56,8 +56,8 @@ StackwalkerMIPS::StackwalkerMIPS(const SystemInfo* system_info,
: Stackwalker(system_info, memory, modules, resolver_helper),
context_(context) {
if (context_->context_flags & MD_CONTEXT_MIPS64 ) {
- if (memory_ && ((memory_->GetBase() + memory_->GetSize() - 1)
- > 0xffffffffffffffff)) {
+ if ((memory_ && memory_->GetBase() + memory_->GetSize() - 1)
+ > 0xffffffffffffffff) {
BPLOG(ERROR) << "Memory out of range for stackwalking mips64: "
<< HexString(memory_->GetBase())
<< "+"
@@ -65,7 +65,7 @@ StackwalkerMIPS::StackwalkerMIPS(const SystemInfo* system_info,
memory_ = NULL;
}
} else {
- if (memory_ && ((memory_->GetBase() + memory_->GetSize() - 1) > 0xffffffff)) {
+ if ((memory_ && memory_->GetBase() + memory_->GetSize() - 1) > 0xffffffff) {
BPLOG(ERROR) << "Memory out of range for stackwalking mips32: "
<< HexString(memory_->GetBase())
<< "+"
diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
index 0263ed5e..d882bbe8 100644
--- a/src/tools/mac/dump_syms/macho_dump.cc
+++ b/src/tools/mac/dump_syms/macho_dump.cc
@@ -140,12 +140,13 @@ void DumpFile(const char *filename) {
size_t object_files_size;
const SuperFatArch* super_fat_object_files =
fat_reader.object_files(&object_files_size);
+ struct fat_arch *object_files;
+ if (!super_fat_object_files->ConvertToFatArch(object_files)) {
+ exit(1);
+ }
printf(" object file count: %ld\n", object_files_size);
for (size_t i = 0; i < object_files_size; i++) {
- struct fat_arch file;
- if (!super_fat_object_files->ConvertToFatArch(&file)) {
- exit(1);
- }
+ const struct fat_arch &file = object_files[i];
const NXArchInfo *fat_arch_info =
google_breakpad::BreakpadGetArchInfoFromCpuType(
file.cputype, file.cpusubtype);