AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-26 12:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ElfW(Off) rather than off_t for offsets within ELF files.

Browse Source
This commit is contained in:
Roland McGrath 2012-10-02 15:56:15 -07:00
parent fc997c6e55
commit 408223d403
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2012-10-02 Roland McGrath <roland@hack.frob.com>
* elf/dl-load.c (_dl_map_object_from_fd: struct loadcmd):
Make 'mapoff' field ElfW(Off) rather than off_t.
2012-10-02 Dmitry V. Levin <ldv@altlinux.org>
* nscd/Makefile: Remove nscd-cflags and all its users.

4
elf/dl-load.c
View File

@ -1090,7 +1090,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
struct loadcmd
{
ElfW(Addr) mapstart, mapend, dataend, allocend;
off_t mapoff;
ElfW(Off) mapoff;
int prot;
} loadcmds[l->l_phnum], *c;
size_t nloadcmds = 0;
@ -1347,7 +1347,7 @@ cannot allocate TLS data structures for initial thread");
l->l_text_end = l->l_addr + c->mapend;
if (l->l_phdr == 0
&& (ElfW(Off)) c->mapoff <= header->e_phoff
&& c->mapoff <= header->e_phoff
&& ((size_t) (c->mapend - c->mapstart + c->mapoff)
>= header->e_phoff + header->e_phnum * sizeof (ElfW(Phdr))))
/* Found the program header in this segment. */