diff options
| author | Orion Hodson <oth@google.com> | 2020-02-06 12:32:08 +0000 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-06 16:18:19 +0000 |
| commit | c20ab9a81aa99d91c8b60a86a9611697ad1e2d76 (patch) | |
| tree | 138338cc236f50ebbab4f5403a28d1748fd82a85 /libnativeloader/library_namespaces.cpp | |
| parent | 9987b74e5a11b910c0de15f02491a101cc763c4f (diff) | |
Use valid pointer for app_main_namespace_
Test: device boots
Test: atest libnativeloader_test
Change-Id: I5c20f7f5c65a707fbeacf644e24b95ffab370cae
Diffstat (limited to 'libnativeloader/library_namespaces.cpp')
| -rw-r--r-- | libnativeloader/library_namespaces.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<NativeLoaderNamespace*> 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, |