From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 9 Jun 2007 02:19:12 +0000 (+0000)
Subject: * elf/dl-lookup.c (_dl_lookup_symbol_x): Remove use of r_nlist.
X-Git-Tag: cvs/glibc-2_6_1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c457089679373802fae6ef65a1804e1c9074b67;p=thirdparty%2Fglibc.git

* elf/dl-lookup.c (_dl_lookup_symbol_x): Remove use of r_nlist.
---

diff --git a/ChangeLog b/ChangeLog
index 4abead59aff..33b2696c894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/dl-lookup.c (_dl_lookup_symbol_x): Remove use of r_nlist.
+
 2007-06-08  Jakub Jelinek  <jakub@redhat.com>
 
 	* elf/dl-close.c (_dl_close_worker): Remove all to be removed
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index a6a958419f1..dc1b865bc75 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -244,13 +244,9 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
 
   size_t i = 0;
   if (__builtin_expect (skip_map != NULL, 0))
-    {
-      /* Search the relevant loaded objects for a definition.  */
-      while ((*scope)->r_list[i] != skip_map)
-	++i;
-
-      assert (i < (*scope)->r_nlist);
-    }
+    /* Search the relevant loaded objects for a definition.  */
+    while ((*scope)->r_list[i] != skip_map)
+      ++i;
 
   /* Search the relevant loaded objects for a definition.  */
   for (size_t start = i; *scope != NULL; start = 0, ++scope)