diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:30:44 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:30:44 +0000 |
| commit | aeaf46b3c97d332af954c1cf848ff0c96c10e753 (patch) | |
| tree | 9a15b32e0f32fd77f19f23b8038d70f073bb4a79 /libc/elf/dl-iteratephdr.c | |
| parent | e90ab566778c1419050621c93f66b5e42da3d966 (diff) | |
| download | eglibc2-aeaf46b3c97d332af954c1cf848ff0c96c10e753.tar.gz | |
Merge changes between r2277 and r3468 from /fsf/glibc-2_6-branch.
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_6@3469 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf/dl-iteratephdr.c')
| -rw-r--r-- | libc/elf/dl-iteratephdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/elf/dl-iteratephdr.c b/libc/elf/dl-iteratephdr.c index d03d8b6da..55cf10852 100644 --- a/libc/elf/dl-iteratephdr.c +++ b/libc/elf/dl-iteratephdr.c @@ -1,5 +1,5 @@ /* Get loaded objects program headers. - Copyright (C) 2001,2002,2003,2004,2006 Free Software Foundation, Inc. + Copyright (C) 2001,2002,2003,2004,2006,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. @@ -54,9 +54,9 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, nloaded += GL(dl_ns)[cnt]._ns_nloaded; if (caller >= (const void *) l->l_map_start - && caller < (const void *) l->l_map_end) - /* There must be exactly one DSO for the range of the virtual - memory. Otherwise something is really broken. */ + && caller < (const void *) l->l_map_end + && (l->l_contiguous + || _dl_addr_inside_object (l, (ElfW(Addr)) caller))) ns = cnt; } |