Fix excessive memory allocation attempts and possible integer overfloaws when attempt...

[deliverable/binutils-gdb.git] / bfd / elf32-mep.c

diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c
index e9d125966c33651f605e228f26ec0468fcd57700..7d0e454aec2e6fc390d911c8965218aa585b8132 100644 (file)
--- a/bfd/elf32-mep.c
+++ b/bfd/elf32-mep.c
@@ -1,5 +1,5 @@
 /* MeP-specific support for 32-bit ELF.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -142,6 +142,7 @@ mep_reloc_type_lookup
 
   if (mep_elf_howto_table[type].type != type)
     {
+      /* xgettext:c-format */
       _bfd_error_handler (_("MeP: howto %d has type %d"),
                          type, mep_elf_howto_table[type].type);
       abort ();
@@ -385,6 +386,7 @@ mep_info_to_howto_rela
   r_type = ELF32_R_TYPE (dst->r_info);
   if (r_type >= R_MEP_max)
     {
+      /* xgettext:c-format */
       _bfd_error_handler (_("%B: invalid MEP reloc number: %d"), abfd, r_type);
       r_type = 0;
     }
@@ -583,7 +585,7 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   old_flags = elf_elfheader (obfd)->e_flags;
 
 #ifdef DEBUG
-  _bfd_error_handler ("%B: old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s",
+  _bfd_error_handler ("%B: old_flags = 0x%.8x, new_flags = 0x%.8x, init = %s",
                      ibfd, old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no");
 #endif
 
@@ -614,7 +616,9 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
        old_flags = (old_flags & ~EF_MEP_CPU_MASK) | new_partial;
       else
        {
-         _bfd_error_handler (_("%B and %B are for different cores"), last_ibfd, ibfd);
+         /* xgettext:c-format */
+         _bfd_error_handler (_("%B and %B are for different cores"),
+                             last_ibfd, ibfd);
          bfd_set_error (bfd_error_invalid_target);
          return FALSE;
        }
@@ -631,7 +635,9 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
        old_flags = (old_flags & ~EF_MEP_INDEX_MASK) | new_partial;
       else
        {
-         _bfd_error_handler (_("%B and %B are for different configurations"), last_ibfd, ibfd);
+         /* xgettext:c-format */
+         _bfd_error_handler (_("%B and %B are for different configurations"),
+                             last_ibfd, ibfd);
          bfd_set_error (bfd_error_invalid_target);
          return FALSE;
        }