MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bfd/

Browse Source 
* elf-nacl.c (nacl_modify_segment_map): Don't crash when INFO is null.
This commit is contained in:
Roland McGrath 2012-11-26 17:49:11 +00:00
parent 17d6efc44b
commit aa6407c6ed
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@ -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> 2012-11-21 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/14493 PR binutils/14493

5
bfd/elf-nacl.c
View File

@ -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 **first_load = NULL;
struct elf_segment_map **last_load = NULL; struct elf_segment_map **last_load = NULL;
bfd_boolean moved_headers = FALSE; 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; bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize;
if (info != NULL && info->user_phdrs) 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 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. */ order. So find the two segments we swapped before, and swap them back. */
bfd_boolean bfd_boolean
nacl_modify_program_headers (bfd *abfd, nacl_modify_program_headers (bfd *abfd, struct bfd_link_info *info)
struct bfd_link_info *info ATTRIBUTE_UNUSED)
{ {
struct elf_segment_map **m = &elf_tdata (abfd)->segment_map; struct elf_segment_map **m = &elf_tdata (abfd)->segment_map;
Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr; Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;