commit aa923f91b12ffd639c723976cd1b962f30de505f
author Devin Moore <devinmoore@google.com> Wed Nov 23 17:34:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 23 17:34:10 2022 +0000
tree 1489e26a0272f941ac9e8d070c19730845969ac0
parent 139fa4c2c313e21ae4538bdebab4f396af1ae8fc
parent ac2bc826a50c692893deb8f42431104ee20fe218

fakeservicemanager: Don't accept null binders for addService am: 5f6ded8825 am: 0ba22cbbe8 am: ac2bc826a5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2308644

Change-Id: I097a12e461886e057cd24d40e213848aca1f97e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/fakeservicemanager/ServiceManager.cpp

diff --git a/libs/fakeservicemanager/ServiceManager.cpp b/libs/fakeservicemanager/ServiceManager.cpp
index 480ec79..deba724 100644
--- a/libs/fakeservicemanager/ServiceManager.cpp
+++ b/libs/fakeservicemanager/ServiceManager.cpp
@@ -36,6 +36,9 @@
 status_t ServiceManager::addService(const String16& name, const sp<IBinder>& service,
                                 bool /*allowIsolated*/,
                                 int /*dumpsysFlags*/) {
+    if (service == nullptr) {
+        return UNEXPECTED_NULL;
+    }
     mNameToService[name] = service;
     return NO_ERROR;
 }

libs/fakeservicemanager/test_sm.cpp

diff --git a/libs/fakeservicemanager/test_sm.cpp b/libs/fakeservicemanager/test_sm.cpp
index 71e5abe..4ddbe0c 100644
--- a/libs/fakeservicemanager/test_sm.cpp
+++ b/libs/fakeservicemanager/test_sm.cpp
@@ -50,6 +50,12 @@
         IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT), OK);
 }
 
+TEST(AddService, SadNullBinder) {
+    auto sm = new ServiceManager();
+    EXPECT_EQ(sm->addService(String16("foo"), nullptr, false /*allowIsolated*/,
+        IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT), android::UNEXPECTED_NULL);
+}
+
 TEST(AddService, HappyOverExistingService) {
     auto sm = new ServiceManager();
     EXPECT_EQ(sm->addService(String16("foo"), getBinder(), false /*allowIsolated*/,