mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-12 14:21:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(dl_main): Correct parsing of ld.so.preload file.

Browse Source
This commit is contained in:
Ulrich Drepper 1998-01-30 16:55:01 +00:00
parent acdcd9290f
commit 651914fe07
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
elf/rtld.c
View File

@ -1,5 +1,5 @@
/* Run time dynamic linker.
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -395,24 +395,29 @@ of this helper program; chances are you did not intend to run this program.\n",
/* We have one problematic case: if we have a name at the end of
the file without a trailing terminating characters, we cannot
place the \0. Handle the case separately. */
if (file[file_size - 1] != ' ' && file[file_size] != '\t'
&& file[file_size] != '\n')
if (file_size > 0 && file[file_size - 1] != ' '
&& file[file_size - 1] != '\t' && file[file_size - 1] != '\n'
&& file[file_size - 1] != ':')
{
problem = &file[file_size];
while (problem > file && problem[-1] != ' ' && problem[-1] != '\t'
&& problem[-1] != '\n')
&& problem[-1] != '\n' && problem[-1] != ':')
--problem;
if (problem > file)
problem[-1] = '\0';
}
else
problem = NULL;
{
problem = NULL;
if (file_size > 0)
file[file_size - 1] = '\0';
}
if (file != problem)
if (file_size > 0 && file != problem)
{
char *p;
runp = file;
runp = file + strspn (file, ": \t\n");
while ((p = strsep (&runp, ": \t\n")) != NULL)
{
struct link_map *new_map = _dl_map_object (NULL, p,
@ -420,6 +425,9 @@ of this helper program; chances are you did not intend to run this program.\n",
if (new_map->l_opencount == 1)
/* It is no duplicate. */
++npreloads;
if (runp != NULL)
runp += strspn (runp, ": \t\n");
}
}