From 8571ac98ab12ff8c5eec4d3f44e8018c6e8e37a6 Mon Sep 17 00:00:00 2001 From: Somin Kim Date: Mon, 4 Sep 2017 12:12:42 +0900 Subject: [PATCH] Fix custom fact validation Change-Id: I93e4eaff60ceccd804a0e339321dbb31c49b0b5d Signed-off-by: Somin Kim --- src/trigger/CustomTemplate.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/trigger/CustomTemplate.cpp b/src/trigger/CustomTemplate.cpp index 2c18d79..93031eb 100644 --- a/src/trigger/CustomTemplate.cpp +++ b/src/trigger/CustomTemplate.cpp @@ -88,12 +88,11 @@ bool CustomTemplate::isValidFact(const Json::Value& tmplJson, const Json::Value& std::string val = factJson[key].asString(); bool found = false; - Json::Value::Members tmplValues; - for (auto& tmplValue : tmplValues) { + for (unsigned int i = 0; i < tmplJson[key][CT_TYPE_ENUM].size(); i++) { + std::string tmplValue = tmplJson[key][CT_TYPE_ENUM][i].asString(); if (tmplValue == val) found = true; } - IF_FAIL_RETURN_TAG(found, false, _E, "Custom fact: Invalid value"); } else { _E("Custom fact: Invalid data type"); -- 2.7.4