Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2a2776 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "init: allow ':' in property names" 

am: af95ecdb

Change-Id: I0f7343072b365cc8cb46f231596f12ec945cee79
parents 48a6049e af95ecdb

init/property_service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ bool is_legal_property_name(const std::string& name) { 
    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 @@ bool is_legal_property_name(const std::string& name) { 
            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;