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

am: 68a9f5a14f Change-Id: Ia56ffdfc942ab4bb07a3b0856804fff3ccbc73b0
2016-10-24 17:45:22 +00:00 · 2016-10-24 17:45:22 +00:00 · 5115f1c77a
parent bae5e2f180 68a9f5a14f
commit 5115f1c77a
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) {