diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-05-11 05:03:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 05:03:07 +0000 |
| commit | d7cbb6f053c29c9967c25b5723be32ae6d26f97d (patch) | |
| tree | 02f8d7918d94d9f8d29f7f83abe86727fcfcad9b /libnativeloader/native_loader.cpp | |
| parent | ddc6a4a0a6d5ee2faab9021ff302142033b16842 (diff) | |
| parent | 6edd0c3a68f60541c31fd65080e52939f2be3bc2 (diff) | |
Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev
am: 6edd0c3a68
* commit '6edd0c3a68f60541c31fd65080e52939f2be3bc2':
nativeloader: Ignore empty java_permitted_path
Change-Id: I1777b3a05d2e233000815172cfa1e56326be634b
Diffstat (limited to 'libnativeloader/native_loader.cpp')
| -rw-r--r-- | libnativeloader/native_loader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index cf8a08952..0df5dbc92 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -78,7 +78,9 @@ class LibraryNamespaces { if (java_permitted_path != nullptr) { ScopedUtfChars path(env, java_permitted_path); - permitted_path = permitted_path + ":" + path.c_str(); + if (path.c_str() != nullptr && path.size() > 0) { + permitted_path = permitted_path + ":" + path.c_str(); + } } if (!initialized_ && !InitPublicNamespace(library_path.c_str(), target_sdk_version)) { |