[AArch64] Fix code formatting in the cpu-table

[deliverable/binutils-gdb.git] / binutils / elfcomm.c

diff --git a/binutils/elfcomm.c b/binutils/elfcomm.c
index bbf19550ecee58d57e3f748649ebbcc4b739e590..05687a0ea592871042cc498352087b01f9d5d67a 100644 (file)
--- a/binutils/elfcomm.c
+++ b/binutils/elfcomm.c
@@ -1,5 +1,5 @@
 /* elfcomm.c -- common code for ELF format file.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@redhat.com>
@@ -510,9 +510,11 @@ process_archive_index_and_symbols (struct archive_info *  arch,
       arch->index_num = byte_get_big_endian (integer_buffer, sizeof_ar_index);
       size -= sizeof_ar_index;
 
-      if (size < arch->index_num * sizeof_ar_index)
+      if (size < arch->index_num * sizeof_ar_index
+         /* PR 17531: file: 585515d1.  */
+         || size < arch->index_num)
        {
-         error (_("%s: the archive index is supposed to have %ld entries of %d bytes, but the size is only %ld\n"),
+         error (_("%s: the archive index is supposed to have 0x%lx entries of %d bytes, but the size is only 0x%lx\n"),
                 arch->file_name, (long) arch->index_num, sizeof_ar_index, size);
          return FALSE;
        }
@@ -653,6 +655,14 @@ setup_archive (struct archive_info *arch, const char *file_name,
                 file_name, arch->longnames_size);
          return 1;
        }
+      /* PR 17531: file: 639d6a26.  */
+      if ((signed long) arch->longnames_size < 0)
+       {
+         error (_("%s: long name table is too big, (size = 0x%lx)\n"),
+                file_name, arch->longnames_size);
+         return 1;
+       }
+
       arch->next_arhdr_offset += sizeof arch->arhdr + arch->longnames_size;
 
       /* Plus one to allow for a string terminator.  */
@@ -674,6 +684,8 @@ setup_archive (struct archive_info *arch, const char *file_name,
 
       if ((arch->longnames_size & 1) != 0)
        getc (file);
+
+      arch->longnames[arch->longnames_size] = 0;
     }
 
   return 0;