Author: kib
Date: Sun May 25 17:02:40 2014
New Revision: 266659
URL: http://svnweb.freebsd.org/changeset/base/266659

Log:
  MFC r266411:
  Fix LD_LIBMAP.
  
  Approved by:  re (gjb)

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

Modified: stable/9/libexec/rtld-elf/libmap.c
==============================================================================
--- stable/9/libexec/rtld-elf/libmap.c  Sun May 25 17:00:22 2014        
(r266658)
+++ stable/9/libexec/rtld-elf/libmap.c  Sun May 25 17:02:40 2014        
(r266659)
@@ -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);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to