gas: remove use of PTR

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

diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c
index 5dc9558078562b39b5d6e4da2d71c00cd7ebc79b..5a8dcf55b2bc74f171226ba84d885e5aec25e112 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-2022 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -145,7 +145,7 @@ do_sections_p1 (struct coff_ofile *head)
       if (strcmp (section->name, ".bss") == 0)
        head->sections[i].data = 1;
       head->sections[i].address = section->lma;
-      head->sections[i].size = bfd_get_section_size (section);
+      head->sections[i].size = bfd_section_size (section);
       head->sections[i].number = idx;
       head->sections[i].nrelocs = section->reloc_count;
       head->sections[i].relocs =
@@ -424,11 +424,20 @@ do_type (unsigned int i)
       if (sym->n_numaux)
        {
          if (aux == NULL)
-           fatal (_("Aggregate definition needs auxillary information"));
+           fatal (_("Aggregate definition needs auxiliary information"));
 
          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)
                {
@@ -465,7 +474,7 @@ do_type (unsigned int i)
       break;
     case T_ENUM:
       if (aux == NULL)
-       fatal (_("Enum definition needs auxillary information"));
+       fatal (_("Enum definition needs auxiliary information"));
       if (aux->x_sym.x_tagndx.p)
        {
          unsigned int idx = INDEXOF (aux->x_sym.x_tagndx.p);
@@ -508,14 +517,24 @@ do_type (unsigned int i)
            int els;
 
            if (aux == NULL)
-             fatal (_("Array definition needs auxillary information"));
+             fatal (_("Array definition needs auxiliary information"));
            els = (dimind < DIMNUM
                   ? aux->x_sym.x_fcnary.x_ary.x_dimen[dimind]
                   : 0);
 
            ++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;
            }
@@ -686,7 +720,7 @@ static struct coff_ofile *
 doit (void)
 {
   unsigned int i;
-  bfd_boolean infile = FALSE;
+  bool infile = false;
   struct coff_ofile *head =
     (struct coff_ofile *) xmalloc (sizeof (struct coff_ofile));
 
@@ -719,7 +753,7 @@ doit (void)
            if (infile)
              pop_scope ();
            else
-             infile = TRUE;
+             infile = true;
 
            push_scope (1);
            file_scope = n->scope = top_scope;
@@ -812,13 +846,13 @@ doit (void)
        case C_UNTAG:
          /* Various definition.  */
          if (top_scope == NULL)
-           fatal (_("Aggregate defintion encountered without a scope"));
+           fatal (_("Aggregate definition encountered without a scope"));
          i = do_define (i, top_scope);
          break;
        case C_EXT:
        case C_LABEL:
          if (file_scope == NULL)
-           fatal (_("Label defintion encountered without a file scope"));
+           fatal (_("Label definition encountered without a file scope"));
          i = do_define (i, file_scope);
          break;
        case C_STAT:
@@ -826,7 +860,7 @@ doit (void)
        case C_AUTO:
        case C_REG:
          if (top_scope == NULL)
-           fatal (_("Variable defintion encountered without a scope"));
+           fatal (_("Variable definition encountered without a scope"));
          i = do_define (i, top_scope);
          break;
        case C_EOS:
@@ -852,16 +886,16 @@ 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)
-    bfd_fatal (abfd->filename);
+    bfd_fatal (bfd_get_filename (abfd));
 
   syms = (asymbol **) xmalloc (storage);
   symcount = bfd_canonicalize_symtab (abfd, syms);
   if (symcount < 0)
-    bfd_fatal (abfd->filename);
+    bfd_fatal (bfd_get_filename (abfd));
   rawsyms = obj_raw_syments (abfd);
   rawcount = obj_raw_syment_count (abfd);
   tindex = (struct coff_symbol **) (xcalloc (sizeof (struct coff_symbol *), rawcount));