commit 8cf0bd75f79ed641b5841dea1d34af18c6b4d40d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 24 17:33:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 24 17:33:08 2016 +0000
tree 548e4e8e2a434ac099d4a8fad81f2c40eec3e273
parent 0ca2fe4c43e4d525979befd0a59d80fb0a9fa649
parent 00860da2f053275442cc5475c52462df510fcaa3

Merge "init: account for "init.svc." prefix in IsValidName"

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) {