Fix address violation bug when disassembling a corrupt SH binary.

[deliverable/binutils-gdb.git] / bfd / merge.c

diff --git a/bfd/merge.c b/bfd/merge.c
index a892dde11dac8052e513c53e6ca8863c20b3fa57..553de8eae5e2faaf869501e94caf4a033ecc663b 100644 (file)
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -1,5 +1,5 @@
 /* SEC_MERGE support.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
    Written by Jakub Jelinek <jakub@redhat.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -859,11 +859,10 @@ _bfd_merged_section_offset (bfd *output_bfd ATTRIBUTE_UNUSED, asection **psec,
   if (offset >= sec->rawsize)
     {
       if (offset > sec->rawsize)
-       {
-         (*_bfd_error_handler)
-           (_("%s: access beyond end of merged section (%ld)"),
-            bfd_get_filename (sec->owner), (long) offset);
-       }
+       _bfd_error_handler
+         /* xgettext:c-format */
+         (_("%B: access beyond end of merged section (%ld)"),
+          sec->owner, (long) offset);
       return secinfo->first_str ? sec->size : 0;
     }