summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-11-09 13:49:40 -0500
committerRich Felker <dalias@aerifal.cx>2012-11-09 13:49:40 -0500
commit65465101ee23447bf30adc3a9ebf817d58f5d956 (patch)
treed473d793b9852d97e61c6a980c96441cd0b12233
parent40d5f7eb8323bcc36344424023b82603fa04cb93 (diff)
downloadmusl-65465101ee23447bf30adc3a9ebf817d58f5d956.tar.gz
support ldso path files without final newline
-rw-r--r--src/ldso/dynlink.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index c295301f..ba2f6129 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -478,8 +478,11 @@ 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)
- sys_path[strlen(sys_path)-1]=0;
+ if (getline(&sys_path, (size_t[1]){0}, f) > 0) {
+ size_t l = strlen(sys_path);
+ if (l && sys_path[l-1]=='\n')
+ sys_path[-1] = 0;
+ }
fclose(f);
}
}