diff options
| author | Roland McGrath <roland@gnu.org> | 2012-11-26 17:49:11 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2012-11-26 17:49:11 +0000 |
| commit | aa6407c6ed97409084568c3336ee334d2f1eb540 (patch) | |
| tree | f5107240b03cb3e0ea53bd5ab49cec3dddab0d0f /bfd | |
| parent | 17d6efc44b4779a1a8a95645daf293a587ef3da9 (diff) | |
| download | fsf-binutils-gdb-aa6407c6ed97409084568c3336ee334d2f1eb540.zip fsf-binutils-gdb-aa6407c6ed97409084568c3336ee334d2f1eb540.tar.gz fsf-binutils-gdb-aa6407c6ed97409084568c3336ee334d2f1eb540.tar.bz2 | |
bfd/
* elf-nacl.c (nacl_modify_segment_map): Don't crash when INFO is null.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elf-nacl.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ff60564..5d033a6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2012-11-26 Roland McGrath <mcgrathr@google.com> + + * elf-nacl.c (nacl_modify_segment_map): Don't crash when INFO is null. + 2012-11-21 H.J. Lu <hongjiu.lu@intel.com> PR binutils/14493 diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c index 04659e7..ce401fa 100644 --- a/bfd/elf-nacl.c +++ b/bfd/elf-nacl.c @@ -75,7 +75,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) struct elf_segment_map **first_load = NULL; struct elf_segment_map **last_load = NULL; bfd_boolean moved_headers = FALSE; - int sizeof_headers = bfd_sizeof_headers (abfd, info); + int sizeof_headers = info == NULL ? 0 : bfd_sizeof_headers (abfd, info); bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize; if (info != NULL && info->user_phdrs) @@ -149,8 +149,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) proper order for the ELF rule that they must appear in ascending address order. So find the two segments we swapped before, and swap them back. */ bfd_boolean -nacl_modify_program_headers (bfd *abfd, - struct bfd_link_info *info ATTRIBUTE_UNUSED) +nacl_modify_program_headers (bfd *abfd, struct bfd_link_info *info) { struct elf_segment_map **m = &elf_tdata (abfd)->segment_map; Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr; |