From 4ea691deb39176240b5c013eb8e07ec6e60763cb Mon Sep 17 00:00:00 2001
From: Lukasz Bardeli <l.bardeli@samsung.com>
Date: Wed, 29 Jun 2016 14:18:59 +0200
Subject: [PATCH] [Calendar] Fix prevent crash

Change-Id: Id256156f8ef0ff110da38472535c6c94378ce22b
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>
---
 src/calendar/calendar.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/calendar/calendar.cc b/src/calendar/calendar.cc
index 0084c0ae..1d2dbfee 100755
--- a/src/calendar/calendar.cc
+++ b/src/calendar/calendar.cc
@@ -507,7 +507,14 @@ PlatformResult Calendar::Find(const picojson::object& args, picojson::array& arr
           value = common::stol(
               FromJson<std::string>(JsonCast<JsonObject>(match_value), "uid"));
         } else {
-          value = common::stol(JsonCast<std::string>(match_value));
+          if (match_value.is<std::string>()) {
+            value = common::stol(JsonCast<std::string>(match_value));
+          } else if (match_value.is<double>()) {
+            value = static_cast<int>(match_value.get<double>());
+          } else {
+            return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
+                                                        "Match value wrong type");
+          }
         }
         if (value < 0) {
           return LogAndCreateResult(
-- 
2.34.1