diff options
| author | nealsid <nealsid@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2009-02-22 01:31:43 +0000 |
|---|---|---|
| committer | nealsid <nealsid@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2009-02-22 01:31:43 +0000 |
| commit | cadc8ddde91cd82aa74375abb45417c75662e9b7 (patch) | |
| tree | 0d23cc26c692f21dfaa9db243a9d2033e8e7075c /src/common/linux | |
| parent | Modify symbol supplier interface to support an overload that takes a symbol d... (diff) | |
| download | breakpad-cadc8ddde91cd82aa74375abb45417c75662e9b7.tar.xz | |
Issue 294: mmap error checking is not correct.
R=Liu
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@312 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common/linux')
| -rw-r--r-- | src/common/linux/dump_symbols.cc | 2 | ||||
| -rw-r--r-- | src/common/linux/file_id.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc index 36cd6d85..aff0d792 100644 --- a/src/common/linux/dump_symbols.cc +++ b/src/common/linux/dump_symbols.cc @@ -759,7 +759,7 @@ bool DumpSymbols::WriteSymbolFile(const std::string &obj_file, return false; void *obj_base = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, obj_fd, 0); - if (!obj_base) + if (obj_base == MAP_FAILED) return false; MmapWrapper map_wrapper(obj_base, st.st_size); ElfW(Ehdr) *elf_header = reinterpret_cast<ElfW(Ehdr) *>(obj_base); diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc index d69d45a9..1adf2a13 100644 --- a/src/common/linux/file_id.cc +++ b/src/common/linux/file_id.cc @@ -101,7 +101,7 @@ bool FileID::ElfFileIdentifier(unsigned char identifier[16]) { } void *base = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if (!base) { + if (base == MAP_FAILED) { close(fd); return false; } |