diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-05-11 04:58:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-11 04:58:17 +0000 |
| commit | 6edd0c3a68f60541c31fd65080e52939f2be3bc2 (patch) | |
| tree | 577d57408213661a199d6939abb76a716335cc5f /libnativeloader/native_loader.cpp | |
| parent | 8a59fa85243a5f748108279f6d30b01292518b0a (diff) | |
| parent | d0b1531929d76411d964d4077d441d751e2c01fb (diff) | |
Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev
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 0b49b4106..8103b37a0 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)) { |