commit 78b10daab31721e358ba8aa29ff0409e708fb106
author Dimitry Ivanov <dimitry@google.com> Sun May 14 17:33:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun May 14 17:33:21 2017 +0000
tree 9e4f42b8688e3194168272aa379003786e37ce0e
parent 148a06a7c36182c0d0aa7e4ccaa18083374d364b
parent 772db5e6d485707dc87d419dbb2c56a184b2128f

loader: fix leak of child-to-parent links on dlclose()
am: 772db5e6d4

Change-Id: I538995372384103dcbd1ca6f3ff5fcd4ae80c972

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 54867dc..d200c22 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -884,12 +884,11 @@
   }
 
   if (si == parent) {
-    DL_ERR("recursive link to \"%s\"", si->name);
     return true;
   }
 
-  return !parent->get_parents().visit([&](soinfo* grandparent) {
-    return !is_recursive(si, grandparent);
+  return !si->get_children().visit([&](soinfo* child) {
+    return !is_recursive(child, parent);
   });
 }
 
@@ -928,6 +927,7 @@
     soinfo* needed_by = task->get_needed_by();
 
     if (is_recursive(si, needed_by)) {
+      DL_ERR("recursive link to \"%s\"", si->name);
       return false;
     }
 
@@ -1706,7 +1706,6 @@
 
 void soinfo::add_child(soinfo* child) {
   if (has_min_version(0)) {
-    child->parents.push_back(this);
     this->children.push_back(child);
   }
 }