commit 01162f24696aedd0f80fde006596bec7786ac684
author Jiyong Park <jiyong@google.com> Mon Oct 16 15:31:09 2017 +0900
committer Jiyong Park <jiyong@google.com> Thu Oct 19 15:13:54 2017 +0900
tree df56be16f8b8caffdb1b8ed76ea7634ef7934476
parent 8f57fd41790883ce210866a5a20d77cc910c87ad

Fix: linker segfault on dlopen of a DF_1_GLOBAL so

Added the missing null check routine.

Bug: 67755729
Test: dlfcn.dlopen_df_1_global added and it passes
Change-Id: Ibe8db18b0b5a481e2e9937041abef6d6b179dd87

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index f6ca430..ec92c92 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1621,11 +1621,13 @@
   }
 
   // Step 4-3: Add the new global group members to all the linked namespaces
-  for (auto si : new_global_group_members) {
+  if (namespaces != nullptr) {
     for (auto linked_ns : *namespaces) {
-      if (si->get_primary_namespace() != linked_ns) {
-        linked_ns->add_soinfo(si);
-        si->add_secondary_namespace(linked_ns);
+      for (auto si : new_global_group_members) {
+        if (si->get_primary_namespace() != linked_ns) {
+          linked_ns->add_soinfo(si);
+          si->add_secondary_namespace(linked_ns);
+        }
       }
     }
   }