lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

elf: remove redundant code from is_dst

Browse Source 
is_dst is called either by _dl_dst_count or by _dl_dst_substitute.
_dl_dst_count is called by DL_DST_COUNT only.
DL_DST_COUNT is called either by expand_dst with is_path == 0
or by expand_dynamic_string_token.
_dl_dst_substitute is called either from expand_dst with is_path == 0
or from expand_dynamic_string_token.
The latter function is called either from _dl_map_object with is_path == 0
or from fillin_rpath with is_path == 1 and name containing no ':'.

In any case (is_path && name[i] == ':') is always false and all code
depending on it can be safely removed.

* elf/dl-load.c (is_dst): Remove checks that is_path is set and name
contains ':', and all code depending on these checks.
This commit is contained in:
Dmitry V. Levin
2017-12-20 11:27:51 +00:00
parent 97f13188c9
commit 1c36e1e6a5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2017-12-27 Dmitry V. Levin <ldv@altlinux.org> 2017-12-27 Dmitry V. Levin <ldv@altlinux.org>
* elf/dl-load.c (is_dst): Remove checks that is_path is set and name
contains ':'.
* elf/dl-load.c (_dl_dst_substitute): Remove checks that is_path * elf/dl-load.c (_dl_dst_substitute): Remove checks that is_path
is set and name contains ':', and all code depending on these checks. is set and name contains ':', and all code depending on these checks.

8
elf/dl-load.c
View File

@ -206,14 +206,12 @@ is_dst (const char *start, const char *name, const char *str,
/* Skip over closing curly brace and adjust for the --name. */ /* Skip over closing curly brace and adjust for the --name. */
len += 2; len += 2;
} }
else if (name[len] != '\0' && name[len] != '/' else if (name[len] != '\0' && name[len] != '/')
&& (!is_path || name[len] != ':'))
return 0; return 0;
if (__glibc_unlikely (secure) if (__glibc_unlikely (secure)
&& ((name[len] != '\0' && name[len] != '/' && ((name[len] != '\0' && name[len] != '/')
&& (!is_path || name[len] != ':')) || (name != start + 1)))
|| (name != start + 1 && (!is_path || name[-2] != ':'))))
return 0; return 0;
return len; return len;