From 137d98b268b8545b37c7f6d18a60179416165ab3 Mon Sep 17 00:00:00 2001 From: hyunho Date: Wed, 5 Feb 2020 17:29:50 +0900 Subject: [PATCH] Fix wrong invalid param check Change-Id: Ifc0ecfa60633afa94afa8f47fc9b8b8cfeb8277a Signed-off-by: hyunho --- widget_viewer_evas/src/widget_viewer_evas.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c index b8326e4..3511695 100644 --- a/widget_viewer_evas/src/widget_viewer_evas.c +++ b/widget_viewer_evas/src/widget_viewer_evas.c @@ -1504,6 +1504,18 @@ API Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char * return NULL; } + if (!widget_id) { + set_last_result(WIDGET_ERROR_INVALID_PARAMETER); + LOGE("widget package id is invalid"); + return NULL; + } + + if (!parent) { + set_last_result(WIDGET_ERROR_INVALID_PARAMETER); + LOGE("parent(window) object is invalid"); + return NULL; + } + max_instance_cnt = widget_service_get_widget_max_count(widget_id); if (max_instance_cnt < 0) { set_last_result(WIDGET_ERROR_FAULT);/* LCOV_EXCL_LINE */ @@ -1535,18 +1547,6 @@ API Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char * return NULL; } - if (!parent) { - set_last_result(WIDGET_ERROR_INVALID_PARAMETER); - LOGE("parent(window) object is invalid"); - return NULL; - } - - if (!widget_id) { - set_last_result(WIDGET_ERROR_INVALID_PARAMETER); - LOGE("widget package id is invalid"); - return NULL; - } - if (widget_instance_create(widget_id, &instance_id) < 0) { set_last_result(WIDGET_ERROR_FAULT);/* LCOV_EXCL_LINE */ return NULL; -- 2.7.4