lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

malloc: Use compat_symbol_reference in libmcheck [BZ #22050]

Browse Source 
Since glibc 2.24, __malloc_initialize_hook is a compat symbol.  As a
result, the link editor does not export a definition of
__malloc_initialize_hook from the main program, so that it no longer
interposes the variable definition in libc.so.  Specifying the symbol
version restores the exported symbol.
This commit is contained in:
Florian Weimer
2017-10-16 20:52:34 +02:00
parent d8287b36ab
commit 7ece6cd509
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2017-10-16 Florian Weimer <fweimer@redhat.com>
[BZ #22050]
* malloc/mcheck-init.c (__malloc_initialize_hook): Use
compat_symbol_reference to access non-default version.
2017-10-16 Florian Weimer <fweimer@redhat.com> 2017-10-16 Florian Weimer <fweimer@redhat.com>
* malloc/Makefile (others-extras): Set to mcheck-init.o. * malloc/Makefile (others-extras): Set to mcheck-init.o.

3
malloc/mcheck-init.c
View File

@ -20,6 +20,7 @@
#include <malloc.h> #include <malloc.h>
#include <mcheck.h> #include <mcheck.h>
#include <shlib-compat.h>
static void static void
turn_on_mcheck (void) turn_on_mcheck (void)
@ -28,3 +29,5 @@ turn_on_mcheck (void)
} }
void (*__malloc_initialize_hook) (void) = turn_on_mcheck; void (*__malloc_initialize_hook) (void) = turn_on_mcheck;
compat_symbol_reference (libc, __malloc_initialize_hook,
__malloc_initialize_hook, GLIBC_2_0);