aboutsummaryrefslogtreecommitdiff
path: root/bfd/elf64-x86-64.c
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/elf64-x86-64.c')
-rw-r--r--bfd/elf64-x86-64.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 927b3ed..ea837a3 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -3411,7 +3411,11 @@ elf_x86_64_relocate_section (bfd *output_bfd,
sreloc = elf_section_data (input_section)->sreloc;
- BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
+ if (sreloc == NULL || sreloc->contents == NULL)
+ {
+ r = bfd_reloc_notsupported;
+ goto check_relocation_error;
+ }
elf_append_rela (output_bfd, sreloc, &outrel);
@@ -3868,6 +3872,7 @@ do_relocation:
contents, rel->r_offset,
relocation, rel->r_addend);
+check_relocation_error:
if (r != bfd_reloc_ok)
{
const char *name;
@@ -3896,7 +3901,7 @@ do_relocation:
else
{
(*_bfd_error_handler)
- (_("%B(%A+0x%lx): reloc against `%s': error %d"),
+ (_("%B(%A+0x%lx): reloc against `%s': error %r"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
return FALSE;