From c20ab9a81aa99d91c8b60a86a9611697ad1e2d76 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Thu, 6 Feb 2020 12:32:08 +0000 Subject: Use valid pointer for app_main_namespace_ Test: device boots Test: atest libnativeloader_test Change-Id: I5c20f7f5c65a707fbeacf644e24b95ffab370cae --- libnativeloader/library_namespaces.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libnativeloader/library_namespaces.cpp') diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp index 891d75e160..b7276512f7 100644 --- a/libnativeloader/library_namespaces.cpp +++ b/libnativeloader/library_namespaces.cpp @@ -303,12 +303,12 @@ Result LibraryNamespaces::Create(JNIEnv* env, uint32_t t } } - 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, -- cgit v1.2.3