From c2c5a2410a2d7861d3c4f07f039eb8c471741cfa Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Mon, 16 Sep 2013 11:30:48 -0700 Subject: [PATCH] property_service: address comments from previous review. Address post-submit comments from 694636142113d91c2b9585ad28e143d4ff001584 Bug: 10733330 Change-Id: I7c652f7ef0379536df48b9478a2362f1bfd252fe --- init/property_service.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/init/property_service.c b/init/property_service.c index c3707691f..1b9327ce3 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -281,7 +281,6 @@ static void write_persistent_property(const char *name, const char *value) static bool is_legal_property_name(const char* name, size_t namelen) { size_t i; - bool previous_was_dot = false; if (namelen >= PROP_NAME_MAX) return false; if (namelen < 1) return false; if (name[0] == '.') return false; @@ -291,11 +290,10 @@ static bool is_legal_property_name(const char* name, size_t namelen) /* Don't allow ".." to appear in a property name */ for (i = 0; i < namelen; i++) { if (name[i] == '.') { - if (previous_was_dot == true) return false; - previous_was_dot = true; + // i=0 is guaranteed to never have a dot. See above. + if (name[i-1] == '.') return false; continue; } - previous_was_dot = false; if (name[i] == '_' || name[i] == '-') continue; if (name[i] >= 'a' && name[i] <= 'z') continue; if (name[i] >= 'A' && name[i] <= 'Z') continue;