Author: bdrewery
Date: Fri Jul 22 00:43:32 2016
New Revision: 303169
URL: https://svnweb.freebsd.org/changeset/base/303169

Log:
  MFC r302908:
  
    Fix dlsym(RTLD_NEXT) handling to only return the next library in last 
library
    cases.

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

Modified: stable/10/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/10/libexec/rtld-elf/rtld.c   Fri Jul 22 00:00:09 2016        
(r303168)
+++ stable/10/libexec/rtld-elf/rtld.c   Fri Jul 22 00:43:32 2016        
(r303169)
@@ -3181,7 +3181,7 @@ do_dlsym(void *handle, const char *name,
                   handle == RTLD_SELF) { /* ... caller included */
            if (handle == RTLD_NEXT)
                obj = globallist_next(obj);
-           TAILQ_FOREACH_FROM(obj, &obj_list, next) {
+           for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
                if (obj->marker)
                    continue;
                res = symlook_obj(&req, obj);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to