am 49715dcc: Merge "Fix a mistype in segment overrange checking"

* commit '49715dcc8a8be1b4545b91e453467e1c45343e51':
  Fix a mistype in segment overrange checking
This commit is contained in:
Elliott Hughes 2015-08-20 23:26:37 +00:00 committed by Android Git Automerger
commit 21a285029b

View File

@ -382,7 +382,7 @@ bool ElfReader::LoadSegments() {
return false;
}
if (file_end >= static_cast<size_t>(file_size_)) {
if (file_end > static_cast<size_t>(file_size_)) {
DL_ERR("invalid ELF file \"%s\" load segment[%zd]:"
" p_offset (%p) + p_filesz (%p) ( = %p) past end of file (0x%" PRIx64 ")",
name_, i, reinterpret_cast<void*>(phdr->p_offset),