RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make dynamic linker accept : or \n as path separator 

this allows /etc/ld-musl-$(ARCH).path to contain one path per line,
which is much more convenient for users than the :-delimited format,
which was a source of repeated and unnecessary confusion. for
simplicity, \n is also accepted in environment variables, though it
should probably not be used there.

at the same time, issues with overly long paths invoking UB or getting
truncated have been fixed. such issues should not have arisen with the
environment (which is size-limited) but could have been generated by a
path file larger than 2**31 bytes in length.
This commit is contained in:
Rich Felker 2013-04-20 11:51:58 -04:00
parent 7bec92e793
commit 8c203eae1e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ldso/dynlink.c
View File

@ -403,16 +403,16 @@ error:
return 0; return 0;
} }
static int path_open(const char *name, const char *search, char *buf, size_t buf_size) static int path_open(const char *name, const char *s, char *buf, size_t buf_size)
{ {
const char *s=search, *z; size_t l;
int l, fd; int fd;
for (;;) { for (;;) {
while (*s==':') s++; s += strspn(s, ":\n");
if (!*s) return -1; l = strcspn(s, ":\n");
z = strchr(s, ':'); if (l-1 >= INT_MAX) return -1;
l = z ? z-s : strlen(s); if (snprintf(buf, buf_size, "%.*s/%s", (int)l, s, name) >= buf_size)
snprintf(buf, buf_size, "%.*s/%s", l, s, name); continue;
if ((fd = open(buf, O_RDONLY|O_CLOEXEC))>=0) return fd; if ((fd = open(buf, O_RDONLY|O_CLOEXEC))>=0) return fd;
s += l; s += l;
} }