diff options
| author | Patsy Franklin <pfrankli@redhat.com> | 2017-08-29 15:53:28 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-08-29 15:53:28 +0200 |
| commit | 1cf1232cd4721dc155a5cf7d571e5b1dae506430 (patch) | |
| tree | bb78b85294b07816b899e8ecac58b9bc5a41475a /iconv/gconv_dl.c | |
| parent | f11f2f6e145d6fc6b52f6b0733599f8b96595733 (diff) | |
| download | glibc-1cf1232cd4721dc155a5cf7d571e5b1dae506430.tar glibc-1cf1232cd4721dc155a5cf7d571e5b1dae506430.tar.gz glibc-1cf1232cd4721dc155a5cf7d571e5b1dae506430.tar.bz2 glibc-1cf1232cd4721dc155a5cf7d571e5b1dae506430.zip | |
gconv: Consistently mangle NULL function pointers [BZ #22025]
Not mangling NULL pointers is not safe because with very low
probability, a non-NULL function pointer can turn into a NULL pointer
after mangling.
Diffstat (limited to 'iconv/gconv_dl.c')
| -rw-r--r-- | iconv/gconv_dl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c index 241836204d..d7dbba90a2 100644 --- a/iconv/gconv_dl.c +++ b/iconv/gconv_dl.c @@ -131,10 +131,8 @@ __gconv_find_shlib (const char *name) #ifdef PTR_MANGLE PTR_MANGLE (found->fct); - if (found->init_fct != NULL) - PTR_MANGLE (found->init_fct); - if (found->end_fct != NULL) - PTR_MANGLE (found->end_fct); + PTR_MANGLE (found->init_fct); + PTR_MANGLE (found->end_fct); #endif /* We have succeeded in loading the shared object. */ |