aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-lookup.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b129b320b2..67c0c38c43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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
of htab_find_slot().
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 39f463eae1..f869dcfa96 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),