From: kibak.yoon <kibak.yoon@samsung.com>
Date: Tue, 12 Jul 2016 12:18:22 +0000 (+0900)
Subject: sensor: recorder: add error cases for setting time/interval to query
X-Git-Tag: accepted/tizen/common/20160715.175700^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5fb1c7a3620db32922158cb989894ef70f5b35c;p=platform%2Fcore%2Fapi%2Fsensor.git

sensor: recorder: add error cases for setting time/interval to query

Change-Id: I56b6477275c9e21d68f2e371b11f97b02f27eca2
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
---

diff --git a/src/sensor_recorder.cpp b/src/sensor_recorder.cpp
index 4a962b8..c16dd4c 100644
--- a/src/sensor_recorder.cpp
+++ b/src/sensor_recorder.cpp
@@ -290,6 +290,8 @@ int sensor_recorder_query_set_int(sensor_recorder_query_h query, sensor_recorder
 		return SENSOR_ERROR_INVALID_PARAMETER;
 	if (query_keys.find(attribute) == query_keys.end())
 		return SENSOR_ERROR_INVALID_PARAMETER;
+	if (attribute == SENSOR_RECORDER_QUERY_TIME_INTERVAL && value < 0)
+		return SENSOR_ERROR_INVALID_PARAMETER;
 
 	static_cast<ctx::Json *>(query)->set(NULL, query_keys[attribute].c_str(), (int)value);
 
@@ -300,14 +302,26 @@ int sensor_recorder_query_set_int(sensor_recorder_query_h query, sensor_recorder
 
 int sensor_recorder_query_set_time(sensor_recorder_query_h query, sensor_recorder_query_e attribute, time_t t)
 {
+	ctx::Json *time_query = static_cast<ctx::Json *>(query);
+	int64_t endTime;
+	int64_t startTime;
+
 	if (!query)
 		return SENSOR_ERROR_INVALID_PARAMETER;
 	if (attribute < 0)
 		return SENSOR_ERROR_INVALID_PARAMETER;
 	if (query_keys.find(attribute) == query_keys.end())
 		return SENSOR_ERROR_INVALID_PARAMETER;
+	if (t < 0)
+		return SENSOR_ERROR_INVALID_PARAMETER;
+	if (time_query->get(NULL, KEY_END_TIME, &endTime))
+		if (attribute == SENSOR_RECORDER_QUERY_START_TIME && t >= endTime)
+			return SENSOR_ERROR_INVALID_PARAMETER;
+	if (time_query->get(NULL, KEY_START_TIME, &startTime))
+		if (attribute == SENSOR_RECORDER_QUERY_END_TIME && t <= startTime)
+			return SENSOR_ERROR_INVALID_PARAMETER;
 
-	static_cast<ctx::Json *>(query)->set(NULL, query_keys[attribute].c_str(), (int64_t)t);
+	time_query->set(NULL, query_keys[attribute].c_str(), (int64_t)t);
 
 	_D("Set attribute[%d] with value[%ld] to query[%p]", attribute, t, query);