Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / coff-x86_64.c

diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
index 1e31395117add80e307e570b96d0919dcd75d665..fb5971d633f39cdd6fe6071100e4c2566f2d02c7 100644 (file)
--- a/bfd/coff-x86_64.c
+++ b/bfd/coff-x86_64.c
@@ -1,6 +1,5 @@
 /* BFD back-end for AMD 64 COFF files.
-   Copyright 2006, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -18,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.
-   
+
    Written by Kai Tietz, OneVision Software GmbH&CoKg.  */
 
 #ifndef COFF_WITH_pex64
@@ -144,6 +143,16 @@ coff_amd64_reloc (bfd *abfd,
        reloc_howto_type *howto = reloc_entry->howto;
        unsigned char *addr = (unsigned char *) data + reloc_entry->address;
 
+       /* FIXME: We do not have an end address for data, so we cannot
+          accurately range check any addresses computed against it.
+          cf: PR binutils/17512: file: 1085-1761-0.004.
+          For now we do the best that we can.  */
+       if (addr < (unsigned char *) data || addr > ((unsigned char *) data) + input_section->size)
+         {
+           bfd_set_error (bfd_error_bad_value);
+           return bfd_reloc_notsupported;
+         }
+
        switch (howto->size)
          {
          case 0:
@@ -178,7 +187,8 @@ coff_amd64_reloc (bfd *abfd,
            break;
 
          default:
-           abort ();
+           bfd_set_error (bfd_error_bad_value);
+           return bfd_reloc_notsupported;
          }
       }
 
@@ -449,6 +459,8 @@ static reloc_howto_type howto_table[] =
         PCRELOFFSET)           /* pcrel_offset */
 };
 
+#define NUM_HOWTOS ARRAY_SIZE (howto_table)
+
 /* Turn a howto into a reloc  nunmber */
 
 #define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
@@ -457,7 +469,7 @@ static reloc_howto_type howto_table[] =
 
 #define RTYPE2HOWTO(cache_ptr, dst)            \
   ((cache_ptr)->howto =                                \
-   ((dst)->r_type < ARRAY_SIZE (howto_table))  \
+   ((dst)->r_type < NUM_HOWTOS)                        \
     ? howto_table + (dst)->r_type              \
     : NULL)
 
@@ -487,7 +499,7 @@ static reloc_howto_type howto_table[] =
       coffsym = (obj_symbols (abfd)                            \
                 + (cache_ptr->sym_ptr_ptr - symbols));         \
     else if (ptr)                                              \
-      coffsym = coff_symbol_from (abfd, ptr);                  \
+      coffsym = coff_symbol_from (ptr);                                \
                                                                \
     if (coffsym != NULL                                                \
        && coffsym->native->u.syment.n_scnum == 0)              \
@@ -497,7 +509,8 @@ static reloc_howto_type howto_table[] =
       cache_ptr->addend = - (ptr->section->vma + ptr->value);  \
     else                                                       \
       cache_ptr->addend = 0;                                   \
-    if (ptr && howto_table[reloc.r_type].pc_relative)          \
+    if (ptr && reloc.r_type < NUM_HOWTOS                       \
+       && howto_table[reloc.r_type].pc_relative)               \
       cache_ptr->addend += asect->vma;                         \
   }
 
@@ -547,7 +560,7 @@ coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
 {
   reloc_howto_type *howto;
 
-  if (rel->r_type >= ARRAY_SIZE (howto_table))
+  if (rel->r_type >= NUM_HOWTOS)
     {
       bfd_set_error (bfd_error_bad_value);
       return NULL;
@@ -690,7 +703,7 @@ coff_amd64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 {
   unsigned int i;
 
-  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
+  for (i = 0; i < NUM_HOWTOS; i++)
     if (howto_table[i].name != NULL
        && strcasecmp (howto_table[i].name, r_name) == 0)
       return &howto_table[i];
@@ -731,14 +744,11 @@ coff_amd64_is_local_label_name (bfd *abfd, const char *name)
 #define amd64coff_object_p coff_object_p
 #endif
 
-#define _bfd_generic_find_nearest_line_discriminator \
-       coff_find_nearest_line_discriminator
-
 const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
 #else
-  x86_64coff_vec =
+  x86_64_coff_vec =
 #endif
 {
 #ifdef TARGET_NAME