From: John Marino <draco@marino.st>
Date: Sun, 30 Nov 2014 09:59:20 +0000 (+0100)
Subject: rtld: Fix LD_LIBMAP under libmap override
X-Git-Tag: v4.2.0rc~1353
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/b9f3c495b063bed62494cc47d09cea0bea5691bd

rtld: Fix LD_LIBMAP under libmap override

Taken from:	FreeBSD svn 266411 (18 May 2014)
---

diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c
index 8124a29a63..80d9a911d5 100644
--- a/libexec/rtld-elf/libmap.c
+++ b/libexec/rtld-elf/libmap.c
@@ -75,7 +75,7 @@ lm_init(char *libmap_override)
 
 	if (libmap_override) {
 		/*
-		 * Do some character replacement to make $LIBMAP look
+		 * Do some character replacement to make $LDLIBMAP look
 		 * like a text file, then parse it.
 		 */
 		libmap_override = xstrdup(libmap_override);
@@ -89,8 +89,8 @@ lm_init(char *libmap_override)
 				break;
 			}
 		}
-		lmc_parse(p, strlen(p));
-		free(p);
+		lmc_parse(libmap_override, p - libmap_override);
+		free(libmap_override);
 	}
 
 	return (lm_count == 0);