yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing several instances of std::vector::operator[] out of range access

Browse source 
Review URL: https://breakpad.appspot.com/597002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1187 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ivan.penkov@gmail.com 2013-05-21 17:05:35 +00:00
parent e4d3cca3ef
commit 2b1f82e1c8
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/client/linux/minidump_writer/linux_dumper.cc
View file

@ -77,6 +77,9 @@ LinuxDumper::LinuxDumper(pid_t pid)
threads_(&allocator_, 8), threads_(&allocator_, 8),
mappings_(&allocator_), mappings_(&allocator_),
auxv_(&allocator_, AT_MAX + 1) { auxv_(&allocator_, AT_MAX + 1) {
// The passed-in size to the constructor (above) is only a hint.
// Must call .resize() to do actual initialization of the elements.
auxv_.resize(AT_MAX + 1);
} }
LinuxDumper::~LinuxDumper() { LinuxDumper::~LinuxDumper() {
@ -90,8 +93,7 @@ bool
LinuxDumper::ElfFileIdentifierForMapping(const MappingInfo& mapping, LinuxDumper::ElfFileIdentifierForMapping(const MappingInfo& mapping,
bool member, bool member,
unsigned int mapping_id, unsigned int mapping_id,
uint8_t identifier[sizeof(MDGUID)]) uint8_t identifier[sizeof(MDGUID)]) {
{
assert(!member || mapping_id < mappings_.size()); assert(!member || mapping_id < mappings_.size());
my_memset(identifier, 0, sizeof(MDGUID)); my_memset(identifier, 0, sizeof(MDGUID));
if (IsMappedFileOpenUnsafe(mapping)) if (IsMappedFileOpenUnsafe(mapping))
@ -273,7 +275,8 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
const MappingInfo* mapping = FindMapping(stack_pointer); const MappingInfo* mapping = FindMapping(stack_pointer);
if (!mapping) if (!mapping)
return false; return false;
const ptrdiff_t offset = stack_pointer - (uint8_t*) mapping->start_addr; const ptrdiff_t offset = stack_pointer -
reinterpret_cast<uint8_t*>(mapping->start_addr);
const ptrdiff_t distance_to_end = const ptrdiff_t distance_to_end =
static_cast<ptrdiff_t>(mapping->size) - offset; static_cast<ptrdiff_t>(mapping->size) - offset;
*stack_len = distance_to_end > kStackToCapture ? *stack_len = distance_to_end > kStackToCapture ?

16
src/client/linux/minidump_writer/minidump_writer.cc
View file

@ -1127,8 +1127,8 @@ class MinidumpWriter {
return false; return false;
MDRawLinkMap entry; MDRawLinkMap entry;
entry.name = location.rva; entry.name = location.rva;
entry.addr = (void*)map.l_addr; entry.addr = reinterpret_cast<void*>(map.l_addr);
entry.ld = (void*)map.l_ld; entry.ld = reinterpret_cast<void*>(map.l_ld);
linkmap.CopyIndex(idx++, &entry); linkmap.CopyIndex(idx++, &entry);
} }
} }
@ -1144,11 +1144,14 @@ class MinidumpWriter {
debug.get()->version = debug_entry.r_version; debug.get()->version = debug_entry.r_version;
debug.get()->map = linkmap_rva; debug.get()->map = linkmap_rva;
debug.get()->dso_count = dso_count; debug.get()->dso_count = dso_count;
debug.get()->brk = (void*)debug_entry.r_brk; debug.get()->brk = reinterpret_cast<void*>(debug_entry.r_brk);
debug.get()->ldbase = (void*)debug_entry.r_ldbase; debug.get()->ldbase = reinterpret_cast<void*>(debug_entry.r_ldbase);
debug.get()->dynamic = dynamic; debug.get()->dynamic = dynamic;
wasteful_vector<char> dso_debug_data(dumper_->allocator(), dynamic_length); wasteful_vector<char> dso_debug_data(dumper_->allocator(), dynamic_length);
// The passed-in size to the constructor (above) is only a hint.
// Must call .resize() to do actual initialization of the elements.
dso_debug_data.resize(dynamic_length);
dumper_->CopyFromProcess(&dso_debug_data[0], GetCrashThread(), dynamic, dumper_->CopyFromProcess(&dso_debug_data[0], GetCrashThread(), dynamic,
dynamic_length); dynamic_length);
debug.CopyIndexAfterObject(0, &dso_debug_data[0], dynamic_length); debug.CopyIndexAfterObject(0, &dso_debug_data[0], dynamic_length);
@ -1420,10 +1423,11 @@ class MinidumpWriter {
const char* p = value; const char* p = value;
if (value[0] == '0' && value[1] == 'x') { if (value[0] == '0' && value[1] == 'x') {
p = my_read_hex_ptr(&result, value+2); p = my_read_hex_ptr(&result, value+2);
} else if (entry->format == 'x') } else if (entry->format == 'x') {
p = my_read_hex_ptr(&result, value); p = my_read_hex_ptr(&result, value);
else } else {
p = my_read_decimal_ptr(&result, value); p = my_read_decimal_ptr(&result, value);
}
if (p == value) if (p == value)
continue; continue;