commit c20ab9a81aa99d91c8b60a86a9611697ad1e2d76
author Orion Hodson <oth@google.com> Thu Feb 06 12:32:08 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 06 16:18:19 2020 +0000
tree 138338cc236f50ebbab4f5403a28d1748fd82a85
parent 9987b74e5a11b910c0de15f02491a101cc763c4f

Use valid pointer for app_main_namespace_

Test: device boots
Test: atest libnativeloader_test
Change-Id: I5c20f7f5c65a707fbeacf644e24b95ffab370cae

libnativeloader/library_namespaces.cpp

diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index 891d75e..b727651 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -303,12 +303,12 @@
     }
   }
 
-  namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), *app_ns));
+  auto& emplaced = namespaces_.emplace_back(
+      std::make_pair(env->NewWeakGlobalRef(class_loader), *app_ns));
   if (is_main_classloader) {
-    app_main_namespace_ = &(*app_ns);
+    app_main_namespace_ = &emplaced.second;
   }
-
-  return &(namespaces_.back().second);
+  return &emplaced.second;
 }
 
 NativeLoaderNamespace* LibraryNamespaces::FindNamespaceByClassLoader(JNIEnv* env,