aboutsummaryrefslogtreecommitdiff
path: root/src/client/linux/minidump_writer/linux_dumper.cc
diff options
context:
space:
mode:
authorjessicag.feedback@gmail.com <jessicag.feedback@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-03-30 21:42:27 +0000
committerjessicag.feedback@gmail.com <jessicag.feedback@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-03-30 21:42:27 +0000
commit23c82999a8a8a6761133a7a8e88b5349bcff211a (patch)
tree3e9635052e9acd51ca1ee00958125c19fa56f852 /src/client/linux/minidump_writer/linux_dumper.cc
parentAdding header files at the request of Chrome. (diff)
downloadbreakpad-23c82999a8a8a6761133a7a8e88b5349bcff211a.tar.xz
Another attempt at signed / unsigned int resolution for linux minidump writer.
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@785 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/minidump_writer/linux_dumper.cc')
-rw-r--r--src/client/linux/minidump_writer/linux_dumper.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/linux/minidump_writer/linux_dumper.cc b/src/client/linux/minidump_writer/linux_dumper.cc
index 88900f9b..76dc4db4 100644
--- a/src/client/linux/minidump_writer/linux_dumper.cc
+++ b/src/client/linux/minidump_writer/linux_dumper.cc
@@ -204,10 +204,11 @@ LinuxDumper::BuildProcPath(char* path, pid_t pid, const char* node) const {
bool
LinuxDumper::ElfFileIdentifierForMapping(const MappingInfo& mapping,
- int mapping_id,
+ bool member,
+ unsigned int mapping_id,
uint8_t identifier[sizeof(MDGUID)])
{
- assert(mapping_id == -1 || mapping_id < mappings_.size());
+ assert(!member || mapping_id < mappings_.size());
my_memset(identifier, 0, sizeof(MDGUID));
if (IsMappedFileOpenUnsafe(mapping))
return false;
@@ -239,7 +240,7 @@ LinuxDumper::ElfFileIdentifierForMapping(const MappingInfo& mapping,
bool success = FileID::ElfFileIdentifierFromMappedFile(base, identifier);
sys_munmap(base, st.st_size);
- if (success && mapping_id != -1 && filename_modified) {
+ if (success && member && filename_modified) {
mappings_[mapping_id]->name[filename_len -
sizeof(kDeletedSuffix) + 1] = '\0';
}