fgetws implementation.

[kopensolaris-gnu/glibc.git] / elf / dl-close.c

diff --git a/elf/dl-close.c b/elf/dl-close.c
index 8caa297..a738b11 100644 (file)
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -103,39 +103,18 @@ _dl_close (struct link_map *map)
          if (imap->l_global)
            {
              /* This object is in the global scope list.  Remove it.  */
-             unsigned int cnt = _dl_main_searchlist->r_nlist;
+             int cnt = _dl_main_searchlist->r_nlist;
 
              do
-               if (--cnt < 0)
-                 break;
+               --cnt;
              while (_dl_main_searchlist->r_list[cnt] != imap);
 
-             if (cnt >= 0)
-               {
-                 /* The object was already correctly registered.  */
-                 while (++cnt < _dl_main_searchlist->r_nlist)
-                   _dl_main_searchlist->r_list[cnt - 1]
-                     = _dl_main_searchlist->r_list[cnt];
-
-                 --_dl_main_searchlist->r_nlist;
-               }
-             else
-               {
-                 /* This can happen if loading was interrupted by something
-                    like a missing symbol in the newly loaded objects.  In
-                    this case the object is already marked as global but
-                    `r_nlist' does not count it in.  The pointer is in the
-                    `r_list' array so we keep searching in the other
-                    direction.  */
-                 cnt = _dl_main_searchlist->r_nlist;
-                 while (_dl_main_searchlist->r_list[cnt] != imap)
-                   {
-                     ++cnt;
-                     /* Note that if _dl_global_scope_alloc is zero we
-                        should never come here in the first place.  */
-                     assert (cnt < _dl_global_scope_alloc);
-                   }
-               }
+             /* The object was already correctly registered.  */
+             while (++cnt < _dl_main_searchlist->r_nlist)
+               _dl_main_searchlist->r_list[cnt - 1]
+                 = _dl_main_searchlist->r_list[cnt];
+
+             --_dl_main_searchlist->r_nlist;
            }
 
          /* We can unmap all the maps at once.  We determined the
@@ -186,6 +165,9 @@ _dl_close (struct link_map *map)
          if (imap != map && imap->l_searchlist.r_list != NULL)
            free (imap->l_searchlist.r_list);
 
+         if (imap->l_phdr_allocated)
+           free ((void *) imap->l_phdr);
+
          free (imap);
        }
     }