From: InHong Han Date: Mon, 5 Sep 2022 03:48:40 +0000 (+0900) Subject: Add missing NULL checking X-Git-Tag: submit/tizen/20220905.065723~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1298aa2661a9147325592bc94a4ccc762484568b;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git Add missing NULL checking Change-Id: I0d8b9a7d95c3a227e26e1ee83d13ca60f11e619b --- diff --git a/client/ma.c b/client/ma.c index cd7135a..8eadce7 100644 --- a/client/ma.c +++ b/client/ma.c @@ -2185,9 +2185,13 @@ int ma_get_wakeup_info_wake_word(char** wake_word) ret = __ma_validate_client(false, false, NULL); if (MA_ERROR_NONE != ret) return ret; - if (wake_word) { - *wake_word = strdup(g_wakeup_info.wake_word); + if (NULL == wake_word) { + MA_SLOGE("[ERROR] Invalid parameter"); //LCOV_EXCL_LINE + return MA_ERROR_INVALID_PARAMETER; } + + *wake_word = strdup(g_wakeup_info.wake_word); + return 0; } @@ -2197,19 +2201,17 @@ int ma_get_wakeup_info_extra_data(unsigned char** extra_data, int* extra_data_le ret = __ma_validate_client(false, false, NULL); if (MA_ERROR_NONE != ret) return ret; - if (extra_data) { - *extra_data = (unsigned char*)malloc(g_wakeup_info.extra_data_length); - if (*extra_data) - memcpy(*extra_data, g_wakeup_info.extra_data, g_wakeup_info.extra_data_length); + if (NULL == extra_data || NULL == extra_data_length || NULL == extra_data_desc) { + MA_SLOGE("[ERROR] Invalid parameter"); //LCOV_EXCL_LINE + return MA_ERROR_INVALID_PARAMETER; } - if (extra_data_length) { - *extra_data_length = g_wakeup_info.extra_data_length; - } + *extra_data = (unsigned char*)malloc(g_wakeup_info.extra_data_length); + if (*extra_data) + memcpy(*extra_data, g_wakeup_info.extra_data, g_wakeup_info.extra_data_length); - if (extra_data_desc) { - *extra_data_desc = strdup(g_wakeup_info.extra_data_desc); - } + *extra_data_length = g_wakeup_info.extra_data_length; + *extra_data_desc = strdup(g_wakeup_info.extra_data_desc); return 0; }