about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-07-06 08:09:54 -0700
committerUlrich Drepper <drepper@redhat.com>2010-07-06 08:09:54 -0700
commit5be9d05d3136460cf6cedd3823fd236aeebe83ef (patch)
treea23101fda14bbb0afc403fa242457db33803bb99
parente8ee8bdf2a6fa0b8bde192c71e0c0bfcd45c4bb9 (diff)
downloadglibc-5be9d05d3136460cf6cedd3823fd236aeebe83ef.tar.gz
glibc-5be9d05d3136460cf6cedd3823fd236aeebe83ef.tar.xz
glibc-5be9d05d3136460cf6cedd3823fd236aeebe83ef.zip
Don't pass NULL occation to dl_signal_cerror
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a649f09ce7..3e58a1831e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-06  Andreas Schwab  <schwab@redhat.com>
+
+	* elf/dl-version.c (match_symbol): Don't pass NULL occation to
+	dl_signal_cerror.
+
 2010-07-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Implement
diff --git a/elf/dl-version.c b/elf/dl-version.c
index c59a6c3cd3..4415817046 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -169,7 +169,7 @@ no version information available (required by ", name, ")");
   result = 1;
  call_cerror:
   _dl_signal_cerror (0, map->l_name[0] ? map->l_name : rtld_progname,
-		     NULL, errstring);
+		     N_("version lookup error"), errstring);
   return result;
 }