svn commit: r266640 - stable/10/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Sun May 25 00:57:07 2014
New Revision: 266640
URL: http://svnweb.freebsd.org/changeset/base/266640

Log:
  MFC r266411:
  Fix LD_LIBMAP.

Modified:
  stable/10/libexec/rtld-elf/libmap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/rtld-elf/libmap.c
==============================================================================
--- stable/10/libexec/rtld-elf/libmap.c	Sun May 25 00:13:29 2014	(r266639)
+++ stable/10/libexec/rtld-elf/libmap.c	Sun May 25 00:57:07 2014	(r266640)
@@ -80,7 +80,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);
@@ -94,8 +94,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);