Avoid passing NULL to DSO_FILENAME.

diff --git a/ChangeLog b/ChangeLog
index b129b320b2007612ca49894ed3a195fe5be47621..67c0c38c4322bc72a3ef13b2506776b5381cf266 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
+
+        * 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  <marcus.shawcroft@linaro.org>
 
        * elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure

diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 39f463eae1babdc04713bfca344ae83c9bb963cb..f869dcfa962899a1d0f5c60bad0455f7bf3c526a 100644 (file)
--- 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),