diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:13:28 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:13:28 +0000 |
| commit | 891ea915baaa267b253cd0b7ad37893ae80d5f12 (patch) | |
| tree | 7ad2b7f7dc53e157c1172644515d46a74bc14b22 /libc/elf/rtld.c | |
| parent | baef8ab2ac4daea246a54919204f138ad57cac53 (diff) | |
Merge changes between r25091 and r25240 from /fsf/glibc-2_15-branch.eglibc-2_15
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_15@25241 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf/rtld.c')
| -rw-r--r-- | libc/elf/rtld.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/elf/rtld.c b/libc/elf/rtld.c index b93a01f72..5c39794bf 100644 --- a/libc/elf/rtld.c +++ b/libc/elf/rtld.c @@ -2277,6 +2277,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", lnp->dont_free = 1; lnp = lnp->next; } + /* Also allocated with the fake malloc(). */ + l->l_free_initfini = 0; if (l != &GL(dl_rtld_map)) _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, |