summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/som.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 690c46d8ba..f93f75669e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-26 Tristan Gingold <gingold@adacore.com>
+
+ * som.c (som_get_reloc_upper_bound): If there are no relocs return
+ enough space to hold a NULL pointer.
+
2007-09-26 Alan Modra <amodra@bigpond.net.au>
* elf64-ppc.c (ppc_build_one_stub): Correct rel_hdr.sh_size.
diff --git a/bfd/som.c b/bfd/som.c
index f36e3bc292..006af8cae2 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -4939,8 +4939,11 @@ som_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
return -1;
return (asect->reloc_count + 1) * sizeof (arelent *);
}
- /* There are no relocations. */
- return 0;
+
+ /* There are no relocations. Return enough space to hold the
+ NULL pointer which will be installed if som_canonicalize_reloc
+ is called. */
+ return sizeof (arelent *);
}
/* Convert relocations from SOM (external) form into BFD internal