diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-04-16 12:49:09 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-04-16 12:49:09 +0200 |
| commit | 54627f3c15f4a6e2ff02e60afacdb5f8008d399a (patch) | |
| tree | ca0a25e66c8e6d48c7db07e6152a0549c27a1916 /elf/dl-version.c | |
| parent | 1ef17274decb5381a50a2146cb3444630f67b527 (diff) | |
| parent | 1cdb2151fbad6bff650e85a0476972881bbc027b (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'elf/dl-version.c')
| -rw-r--r-- | elf/dl-version.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/elf/dl-version.c b/elf/dl-version.c index 9e881162a6..c59a6c3cd3 100644 --- a/elf/dl-version.c +++ b/elf/dl-version.c @@ -322,10 +322,14 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode) while (1) { ElfW(Half) ndx = aux->vna_other & 0x7fff; - map->l_versions[ndx].hash = aux->vna_hash; - map->l_versions[ndx].hidden = aux->vna_other & 0x8000; - map->l_versions[ndx].name = &strtab[aux->vna_name]; - map->l_versions[ndx].filename = &strtab[ent->vn_file]; + /* In trace mode, dependencies may be missing. */ + if (__builtin_expect (ndx < map->l_nversions, 1)) + { + map->l_versions[ndx].hash = aux->vna_hash; + map->l_versions[ndx].hidden = aux->vna_other & 0x8000; + map->l_versions[ndx].name = &strtab[aux->vna_name]; + map->l_versions[ndx].filename = &strtab[ent->vn_file]; + } if (aux->vna_next == 0) /* No more symbols. */ |