Updated Danish translation for the BFD library.

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

diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c
index 5dc9558078562b39b5d6e4da2d71c00cd7ebc79b..52ed9206698dce2f6b2d9e9fb5a2ced16c935016 100644 (file)
--- a/binutils/coffgrok.c
+++ b/binutils/coffgrok.c
@@ -1,5 +1,5 @@
 /* coffgrok.c
-   Copyright (C) 1994-2015 Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -428,7 +428,16 @@ do_type (unsigned int i)
 
          if (aux->x_sym.x_tagndx.p)
            {
-             unsigned int idx = INDEXOF (aux->x_sym.x_tagndx.p);
+             unsigned int idx;
+
+             /* PR 17512: file: e72f3988.  */
+             if (aux->x_sym.x_tagndx.l < 0 || aux->x_sym.x_tagndx.p < rawsyms)
+               {
+                 non_fatal (_("Invalid tag index %#lx encountered"), aux->x_sym.x_tagndx.l);
+                 idx = 0;
+               }
+             else
+               idx = INDEXOF (aux->x_sym.x_tagndx.p);
 
              if (idx >= rawcount)
                {
@@ -515,7 +524,17 @@ do_type (unsigned int i)
 
            ++dimind;
            ptr->type = coff_array_type;
-           ptr->size = els * res->size;
+           /* PR 17512: file: ae1971e2.
+              Check for integer overflow.  */
+           {
+             long long a, z;
+             a = els;
+             z = res->size;
+             a *= z;
+             ptr->size = (int) a;
+             if (ptr->size != a)
+               non_fatal (_("Out of range sum for els (%#x) * size (%#x)"), els, res->size);
+           }
            ptr->u.array.dim = els;
            ptr->u.array.array_of = res;
            res = ptr;
@@ -669,7 +688,22 @@ do_define (unsigned int i, struct coff_scope *b)
          if (!is->init)
            {
              is->low = s->where->offset;
-             is->high = s->where->offset + s->type->size;
+             /* PR 17512: file: 37e7a80d.
+                Check for integer overflow computing low + size.  */
+             {
+               long long a, z;
+
+               a = s->where->offset;
+               z = s->type->size;
+               a += z;
+               is->high = (int) a;
+               if (a != is->high)
+                 non_fatal (_("Out of range sum for offset (%#x) + size (%#x)"),
+                            is->low, s->type->size);
+             }
+             /* PR 17512: file: 37e7a80d.  */
+             if (is->high < s->where->offset)
+               fatal (_("Out of range type size: %u"), s->type->size);
              is->init = 1;
              is->parent = s->where->section;
            }
@@ -852,7 +886,7 @@ coff_grok (bfd *inabfd)
       non_fatal (_("%s: is not a COFF format file"), bfd_get_filename (abfd));
       return NULL;
     }
-  
+
   storage = bfd_get_symtab_upper_bound (abfd);
 
   if (storage < 0)