From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 21 Jul 2000 21:04:40 +0000 (+0000)
Subject: (_dl_map_object): Take loader==NULL into account in DF_1_NODEFLIB handling.
X-Git-Tag: upstream/2.30~25055
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5de7684b2262e45cd6094bdd5d6f92e0cb386d05;p=external%2Fglibc.git

(_dl_map_object): Take loader==NULL into account in DF_1_NODEFLIB handling.
---

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 5e714af..ebe4c80 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1469,7 +1469,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 	    {
 	      /* If the loader has the DF_1_NODEFLIB flag set we must not
 		 use a cache entry from any of these directories.  */
-	      if (__builtin_expect (loader->l_flags_1 & DF_1_NODEFLIB, 0))
+	      if (
+#ifndef SHARED
+		  loader != NULL &&
+#endif
+		  __builtin_expect ((loader ?: _dl_loaded)->l_flags_1
+				    & DF_1_NODEFLIB, 0))
 		{
 		  const char *dirp = system_dirs;
 		  int cnt = 0;
@@ -1508,7 +1513,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 
       /* Finally, try the default path.  */
       if (fd == -1
-	  && __builtin_expect (!(loader->l_flags_1 & DF_1_NODEFLIB), 1))
+	  && (
+#ifndef SHARED
+	      loader == NULL ||
+#endif
+	      __builtin_expect (!((loader ?: _dl_loaded)->l_flags_1
+				  & DF_1_NODEFLIB), 1)))
 	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
 			&realname);