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

am: 5115f1c77a Change-Id: Idfd3bb1f56023a5a8e061b93554f3e855c09584b
2016-10-24 17:48:57 +00:00 · 2016-10-24 17:48:57 +00:00 · 670d1eb23b
parent 11361e8b6a 5115f1c77a
commit 670d1eb23b
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) {