commit aaafbe128f51dff92da3cf4f5fc9b47f04f05261
author Dmitriy Ivanov <dimitry@google.com> Fri May 22 22:21:24 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 22 22:22:22 2015 +0000
tree e385f6de4946a9b368fde057e66dc1c712a212fe
parent ffe01a3de62d17cbe1cdf3b40a91d1ac9a9d36b5
parent b96ac41b32e61799c48f3fd07831cc168b95068d

Merge "Fix RTLD_NEXT lookup for the local_group"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 1155a36..34b335e 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -965,7 +965,7 @@
   soinfo* start = solist;
 
   if (handle == RTLD_NEXT) {
-    if (caller == nullptr || caller->next == nullptr) {
+    if (caller == nullptr) {
       return nullptr;
     } else {
       start = caller->next;