Re: bin/171604: commit references a PR

[dfilter service]

The following reply was made to PR bin/171604; it has been noted by GNATS.

From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:  
Subject: Re: bin/171604: commit references a PR
Date: Sat, 22 Sep 2012 05:28:00 +0000 (UTC)

 Author: kib
 Date: Sat Sep 22 05:27:47 2012
 New Revision: 240801
 URL: http://svn.freebsd.org/changeset/base/240801
 
 Log:
   MFC r240686:
   Do not reference z_nodeflib for !objgiven case, thus fixing LD_PRELOAD
   for a non-absolute path.
   
   PR:  bin/171604
 
 Modified:
   stable/9/libexec/rtld-elf/rtld.c
 Directory Properties:
   stable/9/libexec/rtld-elf/   (props changed)
 
 Modified: stable/9/libexec/rtld-elf/rtld.c
 ==============================================================================
 --- stable/9/libexec/rtld-elf/rtld.c   Sat Sep 22 04:22:17 2012        
(r240800)
 +++ stable/9/libexec/rtld-elf/rtld.c   Sat Sep 22 05:27:47 2012        
(r240801)
 @@ -1429,7 +1429,7 @@ find_library(const char *xname, const Ob
  {
      char *pathname;
      char *name;
 -    bool objgiven;
 +    bool nodeflib, objgiven;
  
      objgiven = refobj != NULL;
      if (strchr(xname, '/') != NULL) { /* Hard coded pathname */
 @@ -1464,6 +1464,7 @@ find_library(const char *xname, const Ob
          (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL)
            return (pathname);
      } else {
 +      nodeflib = objgiven ? refobj->z_nodeflib : false;
        if ((objgiven &&
          (pathname = search_library_path(name, refobj->rpath)) != NULL) ||
          (objgiven && refobj->runpath == NULL && refobj != obj_main &&
 @@ -1471,9 +1472,8 @@ find_library(const char *xname, const Ob
          (pathname = search_library_path(name, ld_library_path)) != NULL ||
          (objgiven &&
          (pathname = search_library_path(name, refobj->runpath)) != NULL) ||
 -        (pathname = search_library_path(name, gethints(refobj->z_nodeflib)))
 -        != NULL ||
 -        (objgiven && !refobj->z_nodeflib &&
 +        (pathname = search_library_path(name, gethints(nodeflib))) != NULL ||
 +        (objgiven && !nodeflib &&
          (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != 
NULL))
            return (pathname);
      }
 _______________________________________________
 svn-src-...@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
 
_______________________________________________
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"