commit 3f987f5b3eeb2e0e94c0d826429dfb418fce945f
author Dmitriy Ivanov <dimitry@google.com> Thu Jun 25 15:51:41 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu Jun 25 20:05:50 2015 -0700
tree 332cbe9dbced4189cd59fcae74a81b72506dfd83
parent d19c271599a4b8881213c7bfbb81f87d8e56a101

Fix crash when trying to load invalid ELF file.

Bug: http://b/22047255
Bug: http://b/22091640
Change-Id: I6c51cff43287a6ac4b25fa9ce6a6fc3d232fd047
(cherry picked from commit 06700b2b5e92a365505b15d0d05e2d5b0706c511)

linker/linker_phdr.h

diff --git a/linker/linker_phdr.h b/linker/linker_phdr.h
index 50f2117..3affa66 100644
--- a/linker/linker_phdr.h
+++ b/linker/linker_phdr.h
@@ -39,7 +39,7 @@
 
 class ElfReader {
  public:
-  ElfReader(const char* name, int fd, off64_t file_offset);
+  ElfReader(const char* name, int fd, off64_t file_offset, off64_t file_size);
   ~ElfReader();
 
   bool Load(const android_dlextinfo* extinfo);
@@ -62,6 +62,7 @@
   const char* name_;
   int fd_;
   off64_t file_offset_;
+  off64_t file_size_;
 
   ElfW(Ehdr) header_;
   size_t phdr_num_;