qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* elf/dl-lookup.c (_dl_lookup_symbol_x): Fix possible NULL pointer
	derefernce in error message.  Pretty printing.
This commit is contained in:
Ulrich Drepper 2004-03-10 00:08:55 +00:00
parent 96c2836f06
commit 9363dbb847
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-03-09 Ulrich Drepper <drepper@redhat.com> 2004-03-09 Ulrich Drepper <drepper@redhat.com>
* elf/dl-lookup.c (_dl_lookup_symbol_x): Fix possible NULL pointer
derefernce in error message. Pretty printing.
* po/nl.po: Update from translation team. * po/nl.po: Update from translation team.
2004-03-08 Andreas Schwab <schwab@suse.de> 2004-03-08 Andreas Schwab <schwab@suse.de>

7
elf/dl-lookup.c
View File

@ -279,7 +279,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
&& skip_map == NULL) && skip_map == NULL)
{ {
/* We could find no value for a strong reference. */ /* We could find no value for a strong reference. */
const char *reference_name = undef_map ? undef_map->l_name : NULL; const char *reference_name = undef_map ? undef_map->l_name : "";
const char *versionstr = version ? ", version " : ""; const char *versionstr = version ? ", version " : "";
const char *versionname = (version && version->name const char *versionname = (version && version->name
? version->name : ""); ? version->name : "");
@ -313,14 +313,13 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
{ {
struct sym_val protected_value = { NULL, NULL }; struct sym_val protected_value = { NULL, NULL };
for (scope = symbol_scope; *scope; i = 0, ++scope) for (scope = symbol_scope; *scope != NULL; i = 0, ++scope)
if (do_lookup_x (undef_name, hash, *ref, &protected_value, if (do_lookup_x (undef_name, hash, *ref, &protected_value,
*scope, i, version, flags, skip_map, *scope, i, version, flags, skip_map,
ELF_RTYPE_CLASS_PLT) != 0) ELF_RTYPE_CLASS_PLT) != 0)
break; break;
if (protected_value.s != NULL if (protected_value.s != NULL && protected_value.m != undef_map)
&& protected_value.m != undef_map)
{ {
current_value.s = *ref; current_value.s = *ref;
current_value.m = undef_map; current_value.m = undef_map;