Handle multiple target events before commit resume

[deliverable/binutils-gdb.git] / bfd / elf-attrs.c

diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index 330c621dbf534d82cbb0a55c1fac3437b98bb9c6..bfe135e7fbb6179b6d4c28436f31dcbd4a36de01 100644 (file)
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -1,5 +1,5 @@
 /* ELF attributes support (based on ARM EABI attributes).
-   Copyright (C) 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -42,6 +42,8 @@ uleb128_size (unsigned int i)
 static bfd_boolean
 is_default_attr (obj_attribute *attr)
 {
+  if (ATTR_TYPE_HAS_ERROR (attr->type))
+    return TRUE;
   if (ATTR_TYPE_HAS_INT_VAL (attr->type) && attr->i != 0)
     return FALSE;
   if (ATTR_TYPE_HAS_STR_VAL (attr->type) && attr->s && *attr->s)
@@ -104,7 +106,7 @@ vendor_obj_attr_size (bfd *abfd, int vendor)
     size += obj_attr_size (list->tag, &list->attr);
 
   /* <size> <vendor_name> NUL 0x1 <size> */
-  return ((size || vendor == OBJ_ATTR_PROC)
+  return (size
          ? size + 10 + strlen (vendor_name)
          : 0);
 }
@@ -438,6 +440,15 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
   /* PR 17512: file: 2844a11d.  */
   if (hdr->sh_size == 0)
     return;
+  if (hdr->sh_size > bfd_get_file_size (abfd))
+    {
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: error: attribute section '%pA' too big: %#llx"),
+                         abfd, hdr->bfd_section, (long long) hdr->sh_size);
+      bfd_set_error (bfd_error_invalid_operation);
+      return;
+    }
+
   contents = (bfd_byte *) bfd_malloc (hdr->sh_size + 1);
   if (!contents)
     return;
@@ -472,8 +483,9 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
          len -= section_len;
          if (section_len <= 4)
            {
-             _bfd_error_handler (_("%pB: error: attribute section length too small: %ld"),
-                                 abfd, section_len);
+             _bfd_error_handler
+               (_("%pB: error: attribute section length too small: %" PRId64),
+                abfd, (int64_t) section_len);
              break;
            }
          section_len -= 4;
@@ -600,7 +612,7 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, struct bfd_link_info *info)
        {
          _bfd_error_handler
            /* xgettext:c-format */
-               (_("error: %pB: Object has vendor-specific contents that "
+               (_("error: %pB: object has vendor-specific contents that "
                   "must be processed by the '%s' toolchain"),
                 ibfd, in_attr->s);
          return FALSE;
@@ -610,7 +622,7 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, struct bfd_link_info *info)
          || (in_attr->i != 0 && strcmp (in_attr->s, out_attr->s) != 0))
        {
          /* xgettext:c-format */
-         _bfd_error_handler (_("error: %pB: Object tag '%d, %s' is "
+         _bfd_error_handler (_("error: %pB: object tag '%d, %s' is "
                                "incompatible with tag '%d, %s'"),
                              ibfd,
                              in_attr->i, in_attr->s ? in_attr->s : "",