--- binutils.orig/bfd/dwarf2.c	2018-07-11 11:45:09.491030059 +0100

+++ binutils-2.29/bfd/dwarf2.c	2018-07-11 12:16:12.975943400 +0100

@@ -626,14 +626,24 @@ read_8_bytes (bfd *abfd, bfd_byte *buf,

 }

 static bfd_byte *

-read_n_bytes (bfd *abfd ATTRIBUTE_UNUSED,

-	      bfd_byte *buf,

-	      bfd_byte *end,

-	      unsigned int size ATTRIBUTE_UNUSED)

-{

-  if (buf + size > end)

-    return NULL;

-  return buf;

+read_n_bytes (bfd_byte *           buf,

+	      bfd_byte *           end,

+	      struct dwarf_block * block)

+{

+  unsigned int  size = block->size;

+  bfd_byte *    block_end = buf + size;

+

+  if (block_end > end || block_end < buf)

+    {

+      block->data = NULL;

+      block->size = 0;

+      return end;

+    }

+  else

+    {

+      block->data = buf;

+      return block_end;

+    }

 }

 /* Scans a NUL terminated string starting at BUF, returning a pointer to it.

@@ -1131,8 +1141,7 @@ read_attribute_value (struct attribute *

 	return NULL;

       blk->size = read_2_bytes (abfd, info_ptr, info_ptr_end);

       info_ptr += 2;

-      blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size);

-      info_ptr += blk->size;

+      info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);

       attr->u.blk = blk;

       break;

     case DW_FORM_block4:

@@ -1142,8 +1151,7 @@ read_attribute_value (struct attribute *

 	return NULL;

       blk->size = read_4_bytes (abfd, info_ptr, info_ptr_end);

       info_ptr += 4;

-      blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size);

-      info_ptr += blk->size;

+      info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);

       attr->u.blk = blk;

       break;

     case DW_FORM_data2:

@@ -1183,8 +1191,7 @@ read_attribute_value (struct attribute *

       blk->size = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,

 					 FALSE, info_ptr_end);

       info_ptr += bytes_read;

-      blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size);

-      info_ptr += blk->size;

+      info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);

       attr->u.blk = blk;

       break;

     case DW_FORM_block1:

@@ -1194,8 +1201,7 @@ read_attribute_value (struct attribute *

 	return NULL;

       blk->size = read_1_byte (abfd, info_ptr, info_ptr_end);

       info_ptr += 1;

-      blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size);

-      info_ptr += blk->size;

+      info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);

       attr->u.blk = blk;

       break;

     case DW_FORM_data1: