commit a6ac54a215d6b64f5cc5a59b66c1dbfbb41ea9f5
author Dmitriy Ivanov <dimitry@google.com> Tue Sep 09 10:21:42 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu Sep 11 22:40:48 2014 -0700
tree 9c449ba5033138dc2fb5b80268bbb01a83e5aa4a
parent 8d8a789c49ffb6b71e4b8f34df937cfaaff86e40

Fix unload of recursively linked library

  Expanded test for recursive libs. Fixed bug with unnecessary
  soinfo_free of already loaded library.

Change-Id: I2cc19f2650c8b12a35feeac127ef608ebba44d88

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 0e5142a..4bc10c5 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -843,6 +843,7 @@
   }
 
   if ((dlflags & RTLD_NOLOAD) != 0) {
+    DL_ERR("library \"%s\" wasn't loaded and RTLD_NOLOAD prevented it", name);
     return nullptr;
   }
 
@@ -950,7 +951,6 @@
     soinfo* needed_by = task->get_needed_by();
 
     if (is_recursive(si, needed_by)) {
-      soinfo_free(si);
       return false;
     }