commit 7d971ec14b80cac442aeea8d88e9eb2e3ab6f214
author Dmitriy Ivanov <dimitry@google.com> Tue Sep 09 10:21:42 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Oct 01 16:04:58 2014 -0700
tree a6c49cf522ec4cb5bc43edfbed24fa1dc209ef6b
parent f4cb6313645ef65cc0eea0a439e51b6788cd3439

Fix unload of recursively linked library

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

(cherry picked from commit a6ac54a215d6b64f5cc5a59b66c1dbfbb41ea9f5)

Change-Id: I6907c723d9fbdf6b2777f3f236b1e29b0843edd6

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 1b4fb62..acbb1b0 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;
     }