commit e8bffdc4793ba9b710b0e41060199e2d4e550d5a
author Iliyan Malchev <malchev@google.com> Mon Oct 24 17:41:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 17:41:52 2016 +0000
tree fa864376a04303ca87bab5558cb0d9c12ccc8448
parent 7c18edc001b49accc50181470c91e2850e67b6a9
parent 2edd04f994ac836cddb134fd234311b64c857243

Merge "init: account for "init.svc." prefix in IsValidName" am: 8cf0bd75f7
am: 6b03c273b1

Change-Id: I808cfaf83a575470f50b50b5d17791144d6c291e

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 22fb013..685befd 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -996,7 +996,7 @@
 }
 
 bool ServiceParser::IsValidName(const std::string& name) const {
-    if (name.size() > 16) {
+    if (name.size() > PROP_NAME_MAX - sizeof("init.svc.")) {
         return false;
     }
     for (const auto& c : name) {