X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=ba2f61296d219332764b7dc36011bab2fe04c1a7;hb=5c6443ac42ba00ad3a0b4e98db4cc8f45596ca93;hp=625f80cca6eb38ca86452713920b2de229ee71a4;hpb=2f2f115b58269468304d2f26d029eb470fb44b4a;p=musl

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 625f80cc..ba2f6129 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -478,13 +478,16 @@ 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);
 				}
 			}
-			if (sys_path) fd = path_open(name, sys_path, buf, sizeof buf);
-			else fd = path_open(name, "/lib:/usr/local/lib:/usr/lib", buf, sizeof buf);
+			if (!sys_path) sys_path = "/lib:/usr/local/lib:/usr/lib";
+			fd = path_open(name, sys_path, buf, sizeof buf);
 		}
 		pathname = buf;
 	}