commit 2edd04f994ac836cddb134fd234311b64c857243
author Iliyan Malchev <malchev@google.com> Mon Oct 24 17:38:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 17:38:21 2016 +0000
tree e80eb726f65e38e020d0f19abf52cedd48d7aea3
parent e85f12ede78a4ca7e2cc89ff4da55cc2b063391d
parent 34b290d856bd775c59233b11fcdbe77063116d78

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

Change-Id: I41c9d2472412a4b4cafb23a39598ea0e31619629

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