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

am: 6b03c273b1 Change-Id: I808cfaf83a575470f50b50b5d17791144d6c291e
2016-10-24 17:41:52 +00:00 · 2016-10-24 17:41:52 +00:00 · 68a9f5a14f
parent d53d187531 6b03c273b1
commit 68a9f5a14f
1 changed files with 1 additions and 1 deletions
--- a/init/service.cpp
+++ b/init/service.cpp
@ -996,7 +996,7 @@ void ServiceParser::EndSection() {
 }

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