commit 54807617dde7c816af09517c928a6f1261148faf
author Dimitry Ivanov <dimitry@google.com> Thu Apr 21 14:57:38 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Thu Apr 21 15:37:01 2016 -0700
tree d8fc789208e8d3e2cf2c8b4b187592bd2786a59c
parent 4d9a97bb916aaa7d7bf819ef999d4b1a58d4750d

Improve error message for empty list of public libs

Change-Id: I5a3cbc99d34e05559426b521a964d1407b67a6c4

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 0fdf90d..c193861 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2365,12 +2365,16 @@
 }
 
 bool init_namespaces(const char* public_ns_sonames, const char* anon_ns_library_path) {
-  CHECK(public_ns_sonames != nullptr);
   if (g_public_namespace_initialized) {
     DL_ERR("public namespace has already been initialized.");
     return false;
   }
 
+  if (public_ns_sonames == nullptr || public_ns_sonames[0] == '\0') {
+    DL_ERR("error initializing public namespace: the list of public libraries is empty.");
+    return false;
+  }
+
   std::vector<std::string> sonames = android::base::Split(public_ns_sonames, ":");
 
   ProtectedDataGuard guard;

tests/dlext_test.cpp

diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp
index 87e5dbc..420c934 100644
--- a/tests/dlext_test.cpp
+++ b/tests/dlext_test.cpp
@@ -629,6 +629,10 @@
   ASSERT_STREQ("android_init_namespaces failed: error initializing public namespace: "
                "\"libnstest_public.so\" was not found in the default namespace", dlerror());
 
+  ASSERT_FALSE(android_init_namespaces("", nullptr));
+  ASSERT_STREQ("android_init_namespaces failed: error initializing public namespace: "
+               "the list of public libraries is empty.", dlerror());
+
   const std::string lib_path = std::string(getenv("ANDROID_DATA")) + NATIVE_TESTS_PATH;
 
   const std::string lib_public_path = lib_path + "/public_namespace_libs/" + g_public_lib;