generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Improve error message for files with no sections"

Browse Source 
am: a1ab0d8ed1

* commit 'a1ab0d8ed1c4025233b0d816164eefb1b84159b9':
  Improve error message for files with no sections
This commit is contained in:
Dimitry Ivanov
2015-11-20 19:19:40 +00:00
committed by android-build-merger
parent bb06a84672 a1ab0d8ed1
commit d34c33764e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
linker/linker_phdr.cpp
View File

@@ -268,6 +268,11 @@ bool ElfReader::ReadProgramHeaders() {
bool ElfReader::ReadSectionHeaders() {
shdr_num_ = header_.e_shnum;
if (shdr_num_ == 0) {
DL_ERR("\"%s\" there are no section headers in this file", name_.c_str());
return false;
}
if (!shdr_fragment_.Map(fd_, file_offset_, header_.e_shoff, shdr_num_ * sizeof(ElfW(Shdr)))) {
DL_ERR("\"%s\" shdr mmap failed: %s", name_.c_str(), strerror(errno));
return false;
@@ -288,7 +293,7 @@ bool ElfReader::ReadDynamicSection() {
}
if (dynamic_shdr == nullptr) {
DL_ERR("\"%s\" .dynamic section was not found", name_.c_str());
DL_ERR("\"%s\" .dynamic section header was not found", name_.c_str());
return false;
}