musl - musl - an implementation of the standard library for Linux-based systems

musl - an implementation of the standard library for Linux-based systems

diff options

author	Rich Felker <dalias@aerifal.cx>	2013年06月25日 21:39:35 -0400
committer	Rich Felker <dalias@aerifal.cx>	2013年06月25日 21:39:35 -0400
commit	8813c956e506d57065b7089a98c8fcef1ef58c47 (patch)
tree	e2175a5f21a69ae527c4b22e056b8df4da48b552
parent	e40f48a421a9176e3e298b5bac75f0355b219e58 (diff)
download	musl-8813c956e506d57065b7089a98c8fcef1ef58c47.tar.gz

make newline-delimited dynamic linker path file actually work

apparently the original commit was never tested properly, since getline was only ever reading one line. the intent was to read the entire file, so use getdelim with the null byte as delimiter as a cheap way to read a whole file into memory.

Diffstat

-rw-r--r--

src/ldso/dynlink.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index ee5ec302..8472343a 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c

@@ -478,7 +478,7 @@ static struct dso *load_library(const char *name)

if (!sys_path) {

FILE *f = fopen(ETC_LDSO_PATH, "rbe");

if (f) {

- if (getline(&sys_path, (size_t[1]){0}, f) > 0) {

+ if (getdelim(&sys_path, (size_t[1]){0}, 0, f) > 0) {

size_t l = strlen(sys_path);

if (l && sys_path[l-1]=='\n')

sys_path[l-1] = 0;

generated by cgit v1.2.1 (git 2.18.0) at 2025年09月07日 02:29:46 +0000