Add parameter validation

Change-Id: I55ca5ceb6d3deb44eb4e943c7f7f377bfcec7273
Signed-off-by: Jusung Son <jusung07.son@samsung.com>

diff --git a/watchface-complication/watchface-editable.cc b/watchface-complication/watchface-editable.cc
index d7ea1a2..fc1b72b 100644 (file)
--- a/watchface-complication/watchface-editable.cc
+++ b/watchface-complication/watchface-editable.cc
@@ -178,7 +178,7 @@ extern "C" EXPORT_API int watchface_editable_add_design_element(
     list_handle->candidates_list == nullptr)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
 
-  if (cur_data_idx < 0 &&
+  if (cur_data_idx < 0 ||
     cur_data_idx >= static_cast<int>(
       g_list_length(list_handle->candidates_list)))
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;

diff --git a/watchface-editor/watchface-editor.cc b/watchface-editor/watchface-editor.cc
index b3408ff..3dd93d8 100644 (file)
--- a/watchface-editor/watchface-editor.cc
+++ b/watchface-editor/watchface-editor.cc
@@ -497,6 +497,11 @@ extern "C" EXPORT_API int watchface_editor_editable_candidate_list_get_nth(
   SharedHandle<IEditable>* ptr = static_cast<SharedHandle<IEditable>*>(handle);
   shared_ptr<IEditable> ed = ptr->GetPtr();
   const std::list<std::shared_ptr<Bundle>>& list = ed->GetCandidates();
+  if (nth < 0 || nth >= static_cast<int>(list.size())) {
+    LOGE("Invalid parameter");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
   const std::list<std::shared_ptr<Bundle>>::const_iterator it
                                   = list.begin();
   auto nx = std::next(it, nth);
@@ -563,7 +568,7 @@ extern "C" EXPORT_API int watchface_editor_is_setup_app_exist(
   if (!watchface_complication::util::CheckWatchFeatureEnabled())
     return WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED;
 
-  if (handle == NULL) {
+  if (handle == NULL || exist == NULL) {
     LOGE("Invalid parameter");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }