From: Marcus Shawcroft Date: Wed, 13 Nov 2013 12:40:31 +0000 (+0000) Subject: Avoid passing NULL to DSO_FILENAME. X-Git-Tag: glibc-2.19~524 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50727aa76b42c3b989a8c0612eb7f63e29aa7fec;p=thirdparty%2Fglibc.git Avoid passing NULL to DSO_FILENAME. --- diff --git a/ChangeLog b/ChangeLog index b129b320b20..67c0c38c432 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-13 Marcus Shawcroft + + * elf/dl-lookup.c (_dl_lookup_symbol_x): If UNDEF_MAP is false + set reference_name to "" to avoid passing NULL to DSO_FILENAME. + 2013-11-13 Marcus Shawcroft * elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 39f463eae1b..f869dcfa962 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -746,7 +746,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, contain the needed symbol. This code is never reached for unversioned lookups. */ assert (version != NULL); - const char *reference_name = undef_map ? undef_map->l_name : NULL; + const char *reference_name = undef_map ? undef_map->l_name : ""; /* XXX We cannot translate the message. */ _dl_signal_cerror (0, DSO_FILENAME (reference_name),