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

Commit 8ecf5943 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "init: allow ':' in property names" into oc-dev

parents 14774317 5543b0e8

init/property_service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,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] == '.') {
@@ -153,7 +153,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;