From: Rich Felker <dalias@aerifal.cx>
Date: Fri, 5 Oct 2012 16:09:54 +0000 (-0400)
Subject: small dynamic linker module search fix
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=5f88c0edd5db0916cbbcdec9042d4986ca778ae8

small dynamic linker module search fix

libraries loaded more than once by pathname should not get shortnames
that would cause them to later be used to satisfy non-pathname load
requests.
---

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index f2bcd0f3..3f9bc145 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -483,7 +483,8 @@ static struct dso *load_library(const char *name)
 			/* If this library was previously loaded with a
 			 * pathname but a search found the same inode,
 			 * setup its shortname so it can be found by name. */
-			if (!p->shortname) p->shortname = strrchr(p->name, '/')+1;
+			if (!p->shortname && pathname != name)
+				p->shortname = strrchr(p->name, '/')+1;
 			close(fd);
 			p->refcnt++;
 			return p;