commit 26c1230e439d1df3dbb2141299b17eba8381b3e6
author Tom Cherry <tomcherry@google.com> Tue May 30 23:57:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 23:57:40 2017 +0000
tree 643f48208319d7db7dec8268acf9c38a35597980
parent 2037246fefc25e3d55f98a7e8b00e820b404ac75
parent 4e906c2376e21d6418ef8717837f12cfb1e05f64

Merge "init: allow ':' in property names" am: af95ecdb04
am: 6d2a27768d

Change-Id: I8eaadce8365b86f8a3cab36a18e4fa81901546d9

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 18e47e3..3490544 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -144,7 +144,7 @@
     if (name[0] == '.') return false;
     if (name[namelen - 1] == '.') return false;
 
-    /* Only allow alphanumeric, plus '.', '-', '@', or '_' */
+    /* Only allow alphanumeric, plus '.', '-', '@', ':', or '_' */
     /* Don't allow ".." to appear in a property name */
     for (size_t i = 0; i < namelen; i++) {
         if (name[i] == '.') {
@@ -152,7 +152,7 @@
             if (name[i-1] == '.') return false;
             continue;
         }
-        if (name[i] == '_' || name[i] == '-' || name[i] == '@') continue;
+        if (name[i] == '_' || name[i] == '-' || name[i] == '@' || name[i] == ':') continue;
         if (name[i] >= 'a' && name[i] <= 'z') continue;
         if (name[i] >= 'A' && name[i] <= 'Z') continue;
         if (name[i] >= '0' && name[i] <= '9') continue;