xcoff slurp_armap bounds checking

[deliverable/binutils-gdb.git] / gas / listing.c

diff --git a/gas/listing.c b/gas/listing.c
index 3d294a341d20b55d2b78bd717455c9b252c28b92..a016b7c4b63e613901cc45027dc92c8f228f78c5 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -1,5 +1,5 @@
 /* listing.c - maintain assembly listings
-   Copyright (C) 1991-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -783,7 +783,7 @@ calc_hex (list_info_type *list)
     {
       /* Print as many bytes from the fixed part as is sensible.  */
       octet_in_frag = 0;
-      while ((offsetT) octet_in_frag < frag_ptr->fr_fix
+      while (octet_in_frag < frag_ptr->fr_fix
             && data_buffer_size < MAX_BYTES - 3)
        {
          if (address == ~(unsigned int) 0)
@@ -801,8 +801,8 @@ calc_hex (list_info_type *list)
          unsigned int var_rep_idx = octet_in_frag;
 
          /* Print as many bytes from the variable part as is sensible.  */
-         while (((offsetT) octet_in_frag
-                 < (frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset))
+         while ((octet_in_frag
+                 < frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset)
                 && data_buffer_size < MAX_BYTES - 3)
            {
              if (address == ~(unsigned int) 0)
@@ -816,7 +816,7 @@ calc_hex (list_info_type *list)
              var_rep_idx++;
              octet_in_frag++;
 
-             if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
+             if (var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
                var_rep_idx = var_rep_max;
            }
        }