2008-09-05 Cary Coutant <ccoutant@google.com>

	* fileread.cc (File_read::make_view): Add check for attempt to map
	beyond end of file.

2 files changed, 13 insertions, 0 deletions

diff --git a/gold/ChangeLog b/gold/ChangeLog
index cac87e66e9a..1df7d746391 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-05  Cary Coutant  <ccoutant@google.com>
 
+	* fileread.cc (File_read::make_view): Add check for attempt to map
+	beyond end of file.
+
+2008-09-05  Cary Coutant  <ccoutant@google.com>
+
 	* symtab.cc (Symbol_table::add_from_dynobj): Fix typos in
 	explicit instantiations.
 
diff --git a/gold/fileread.cc b/gold/fileread.cc
index 8c2f8f34cf3..f56e33e39f1 100644
--- a/gold/fileread.cc
+++ b/gold/fileread.cc
@@ -355,6 +355,14 @@ File_read::make_view(off_t start, section_size_type size,
 {
   gold_assert(size > 0);
 
+  // Check that start and end of the view are within the file.
+  if (start > this->size_ || size > this->size_ - start)
+    gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
+                 "size of file; the file may be corrupt"),
+		   this->filename().c_str(),
+		   static_cast<long long>(size),
+		   static_cast<long long>(start));
+
   off_t poff = File_read::page_offset(start);
 
   section_size_type psize = File_read::pages(size + (start - poff));