picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Ulrich Drepper 2000-07-21 21:04:40 +00:00
parent 10b36b41d2
commit 5de7684b22
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
elf/dl-load.c
View file

@ -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);