blob: 7e95b0a6dd8a0b7dd5bfea102c5e832436034283 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
2007-11-28 Nathan Sidwell <nathan@codesourcery.com>
Issue #2297
include/elf/
* internal.h (ELF_IS_SECTION_IN_SEGMENT): Adjust to cope with
segments at the end of memory.
Index: include/elf/internal.h
===================================================================
--- include/elf/internal.h (revision 187336)
+++ include/elf/internal.h (working copy)
@@ -280,11 +280,12 @@ struct elf_segment_map
|| ((bfd_vma) sec_hdr->sh_offset >= segment->p_offset \
&& (sec_hdr->sh_offset + ELF_SECTION_SIZE(sec_hdr, segment) \
<= segment->p_offset + segment->p_filesz))) \
- /* SHF_ALLOC sections must have VMAs within the segment. */ \
+ /* SHF_ALLOC sections must have VMAs within the segment. Be \
+ careful about segments right at the end of memory. */ \
&& ((sec_hdr->sh_flags & SHF_ALLOC) == 0 \
|| (sec_hdr->sh_addr >= segment->p_vaddr \
- && (sec_hdr->sh_addr + ELF_SECTION_SIZE(sec_hdr, segment) \
- <= segment->p_vaddr + segment->p_memsz))))
+ && (sec_hdr->sh_addr - segment->p_vaddr \
+ + ELF_SECTION_SIZE(sec_hdr, segment) <= segment->p_memsz))))
/* Decide if the given sec_hdr is in the given segment in file. */
#define ELF_IS_SECTION_IN_SEGMENT_FILE(sec_hdr, segment) \
--------------040206010003050401040204--
|
