From: Kwangyoun Kim Date: Mon, 6 Mar 2017 06:19:17 +0000 (+0900) Subject: Add command list handle check logic X-Git-Tag: accepted/tizen/unified/20170406.054054^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51bd4ceb583eb41218bbc62fcdc9fe0445314060;p=platform%2Fcore%2Fuifw%2Fvoice-control.git Add command list handle check logic Change-Id: I5a258cbdd2761cb6c99e14b38f72f33e02e8a375 --- diff --git a/client/vc.c b/client/vc.c index 345dfaf..75b930e 100644 --- a/client/vc.c +++ b/client/vc.c @@ -1056,6 +1056,11 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) vc_cmd_list_s* list = NULL; list = (vc_cmd_list_s*)vc_cmd_list; + if (NULL == list->list) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid command list"); + return VC_ERROR_INVALID_PARAMETER; + } + int ret = 0; char* invocation_name = NULL; if (VC_COMMAND_TYPE_BACKGROUND == type) { diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 2001006..4609a1a 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -792,8 +792,19 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) return VC_ERROR_INVALID_STATE; } + if (NULL == vc_cmd_list) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); + return VC_ERROR_INVALID_PARAMETER; + } + vc_cmd_list_s* list = NULL; list = (vc_cmd_list_s*)vc_cmd_list; + SLOG(LOG_INFO, TAG_VCM, "[List] (%p) (%p)", list, list->list); + + if (NULL == list->list) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid command list"); + return VC_ERROR_INVALID_PARAMETER; + } int i; int ret; @@ -1723,6 +1734,10 @@ int vc_mgr_start(bool exclusive_command_option) } } + g_volume_db = 0; + g_prev_volume_db = 0; + g_cur_volume_db = 0; + SLOG(LOG_DEBUG, TAG_VCM, "====="); SLOG(LOG_DEBUG, TAG_VCM, " "); diff --git a/common/vc_command.c b/common/vc_command.c old mode 100755 new mode 100644 index b085344..49f0edc --- a/common/vc_command.c +++ b/common/vc_command.c @@ -366,7 +366,7 @@ int vc_cmd_list_remove_all(vc_cmd_list_h vc_cmd_list, bool release_command) } } } - + list->list = NULL; list->index = -1; SLOG(LOG_DEBUG, TAG_VCCMD, "=====");