diff options
Diffstat (limited to 'elf/dl-open.c')
| -rw-r--r-- | elf/dl-open.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 3f2631a98b..c061cdeb0e 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -312,10 +312,20 @@ dl_open_worker (void *a) while (*runp != NULL) { + /* This can happen if imap was just loaded, but during + relocation had l_opencount bumped because of relocation + dependency. Avoid duplicates in l_scope. */ + if (__builtin_expect (*runp == &new->l_searchlist, 0)) + break; + ++cnt; ++runp; } + if (*runp != NULL) + /* Avoid duplicates. */ + continue; + if (__builtin_expect (cnt + 1 >= imap->l_scope_max, 0)) { /* The 'r_scope' array is too small. Allocate a new one @@ -478,11 +488,11 @@ show_scope (struct link_map *new) for (cnt = 0; cnt < new->l_scope[scope_cnt]->r_nlist; ++cnt) if (*new->l_scope[scope_cnt]->r_list[cnt]->l_name) - _dl_printf (" %s", new->l_scope[scope_cnt]->r_list[cnt]->l_name) + _dl_printf (" %s", new->l_scope[scope_cnt]->r_list[cnt]->l_name); else - _dl_printf (" <main>", NULL); + _dl_printf (" <main>"); - _dl_printf ("\n", NULL); + _dl_printf ("\n"); } } #endif |