From: Cary Coutant <ccoutant@google.com>
Date: Wed, 21 Jan 2015 23:45:55 +0000 (-0800)
Subject: Ignore line tables whose versions we don't support.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=361595a3ded2175e850b23cabfcf7abe0c2c8679;p=thirdparty%2Fbinutils-gdb.git

Ignore line tables whose versions we don't support.

2015-01-21  Cary Coutant  <ccoutant@google.com>

gold/
	* dwarf_reader.cc (Sized_dwarf_line_info::read_header_prolog): Check
	line table version number.
	(Sized_dwarf_line_info::read_line_mappings): Likewise.
---

diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc
index e7c95ce6497..bd641d1f22d 100644
--- a/gold/dwarf_reader.cc
+++ b/gold/dwarf_reader.cc
@@ -1638,11 +1638,17 @@ Sized_dwarf_line_info<size, big_endian>::read_header_prolog(
 
   header_.total_length = initial_length;
 
+  const unsigned char* end_of_initial_length = lineptr;
   gold_assert(lineptr + header_.total_length <= buffer_end_);
 
   header_.version = elfcpp::Swap_unaligned<16, big_endian>::readval(lineptr);
   lineptr += 2;
 
+  // We can only read versions 2 and 3 of the DWARF line number table.
+  // For other versions, just skip the entire line number table.
+  if (header_.version < 2 || header_.version > 3)
+    return end_of_initial_length + initial_length;
+
   if (header_.offset_size == 4)
     header_.prologue_length = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr);
   else
@@ -2027,8 +2033,11 @@ Sized_dwarf_line_info<size, big_endian>::read_line_mappings(unsigned int shndx)
     {
       const unsigned char* lineptr = this->buffer_;
       lineptr = this->read_header_prolog(lineptr);
-      lineptr = this->read_header_tables(lineptr);
-      lineptr = this->read_lines(lineptr, shndx);
+      if (header_.version >= 2 && header_.version <= 3)
+	{
+	  lineptr = this->read_header_tables(lineptr);
+	  lineptr = this->read_lines(lineptr, shndx);
+	}
       this->buffer_ = lineptr;
     }