From: Sejun Park Date: Thu, 26 Dec 2024 08:25:56 +0000 (+0900) Subject: fixed svase issues X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_9.0;p=platform%2Fcore%2Fuifw%2Fstt.git fixed svase issues Change-Id: Ifc1055423d1780e85fe1246e17731f3ce0c14b67 --- diff --git a/client/stt.c b/client/stt.c index f0384be..1376f2c 100644 --- a/client/stt.c +++ b/client/stt.c @@ -836,7 +836,7 @@ int stt_get_private_data(stt_h stt, const char* key, char** data) } } - if (0 == strncmp(*data, "NULL", strlen(*data))) { + if (0 == strncmp(*data, "NULL", strlen(*data) + 1)) { free(*data); *data = NULL; } diff --git a/client/stt_dbus.c b/client/stt_dbus.c index e14a706..9725499 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -127,7 +127,7 @@ char* __stt_get_service_info(const char* stt_server_service_info, char* engine_i char splitter = '.'; SLOG(LOG_INFO, TAG_STTC, "[get_service_info] service_info(%s), engine_id(%s), engine_default(%s)", stt_server_service_info, engine_id, engine_default); - if (NULL == engine_id || NULL == engine_default || 0 == strncmp(engine_id, engine_default, strlen(engine_id))) { + if (NULL == engine_id || NULL == engine_default || 0 == strncmp(engine_id, engine_default, strlen(engine_id) + 1)) { service_info = (char*)calloc(strlen(stt_server_service_info) + 1, sizeof(char)); if (NULL == service_info) { SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); @@ -140,7 +140,7 @@ char* __stt_get_service_info(const char* stt_server_service_info, char* engine_i SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); return NULL; } - if (0 == strncmp(service_info, STT_SERVER_SERVICE_OBJECT_PATH, strlen(service_info))) + if (0 == strncmp(service_info, STT_SERVER_SERVICE_OBJECT_PATH, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + 1)) splitter = '/'; snprintf(service_info, strlen(stt_server_service_info) + strlen(engine_id) - 8, "%s%c%s", stt_server_service_info, splitter, (engine_id + 10)); } diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c index 5cab68f..861bb38 100644 --- a/server/sttd_dbus.c +++ b/server/sttd_dbus.c @@ -597,7 +597,7 @@ int __sttd_get_buxtonkey() __sttd_dbus_service_free(); - if (NULL == engine_default || 0 == strncmp(engine_appid, engine_default, strlen(engine_appid))) { + if (NULL == engine_default || 0 == strncmp(engine_appid, engine_default, strlen(engine_appid) + 1)) { g_server_service_name = (char*)calloc(strlen(STT_SERVER_SERVICE_NAME) + 1, sizeof(char)); if (g_server_service_name) snprintf(g_server_service_name, strlen(STT_SERVER_SERVICE_NAME) + 1, "%s", STT_SERVER_SERVICE_NAME); diff --git a/server/sttd_engine_agent.c b/server/sttd_engine_agent.c index ad4da24..3685298 100644 --- a/server/sttd_engine_agent.c +++ b/server/sttd_engine_agent.c @@ -636,7 +636,7 @@ int sttd_engine_agent_recognize_start_engine(unsigned int uid, const char* lang, int ret; char* temp = NULL; - if (0 == strncmp(lang, "default", strlen("default"))) { + if (0 == strncmp(lang, "default", strlen("default") + 1)) { bool is_valid = false; ret = stt_engine_is_valid_language(g_default_language, &is_valid); if (0 != ret) { diff --git a/server/sttd_recorder.c b/server/sttd_recorder.c index b72bb28..3054366 100644 --- a/server/sttd_recorder.c +++ b/server/sttd_recorder.c @@ -134,7 +134,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void char* audio_type = NULL; int ret = sttd_engine_agent_get_audio_type(&audio_type); if (STTD_ERROR_NONE == ret) { - if (NULL == audio_type || 0 != strncmp(audio_type, STTE_AUDIO_ID_BLUETOOTH, strlen(audio_type))) { + if (NULL == audio_type || 0 != strncmp(audio_type, STTE_AUDIO_ID_BLUETOOTH, strlen(STTE_AUDIO_ID_BLUETOOTH) + 1)) { SLOG(LOG_INFO, TAG_STTD, "[Recorder] BT callback is not mapped with audio_type(%s)", audio_type); free(audio_type); return; @@ -199,7 +199,7 @@ static void _ffv_audio_function_cb(void* data, unsigned int length, void* user_d char* audio_type = NULL; int ret = sttd_engine_agent_get_audio_type(&audio_type); if (STTD_ERROR_NONE == ret) { - if (NULL == audio_type || 0 != strncmp(audio_type, STTE_AUDIO_ID_FFV, strlen(audio_type))) { + if (NULL == audio_type || 0 != strncmp(audio_type, STTE_AUDIO_ID_FFV, strlen(STTE_AUDIO_ID_FFV) + 1)) { SLOG(LOG_INFO, TAG_STTD, "[Recorder] FFV callback is not mapped with audio_type(%s)", audio_type); free(audio_type); return; @@ -620,7 +620,7 @@ static bool is_tct_app(const char* appid) } for (cnt = 0 ; cnt < 5 ; cnt++) { - if (0 == strncmp(appid, g_tct_apps[cnt], strlen(appid))) { + if (0 == strncmp(appid, g_tct_apps[cnt], strlen(appid) + 1)) { SLOG(LOG_INFO, TAG_STTD, "[Recoder INFO] Current app(%s) is TCT app.", appid); return true; } @@ -737,7 +737,7 @@ int sttd_recorder_start(unsigned int uid, const char* appid) } #endif - if (0 == strncmp(client_audio_id, STTE_AUDIO_ID_NONE, strlen(client_audio_id))) { + if (0 == strncmp(client_audio_id, STTE_AUDIO_ID_NONE, strlen(STTE_AUDIO_ID_NONE) + 1)) { if (STTD_ERROR_NONE != start_recording_with_audio_fw()) { SLOG(LOG_ERROR, TAG_STTD, "[Recorder ERROR] Fail to start recording with audio fw"); free(client_audio_id); @@ -893,7 +893,7 @@ int sttd_recorder_stop() } #endif - if (0 == strncmp(client_audio_id, STTE_AUDIO_ID_NONE, strlen(client_audio_id))) { + if (0 == strncmp(client_audio_id, STTE_AUDIO_ID_NONE, strlen(STTE_AUDIO_ID_NONE) + 1)) { if (STTD_ERROR_NONE != stop_recording_with_audio_fw()) { SLOG(LOG_ERROR, TAG_STTD, "[Recorder ERROR] Fail to stop recording with audio fw"); } diff --git a/server/sttd_server.c b/server/sttd_server.c index f5828f9..1d66e27 100644 --- a/server/sttd_server.c +++ b/server/sttd_server.c @@ -1209,7 +1209,7 @@ int sttd_server_start(unsigned int uid, const char* lang, const char* recognitio return ret; } - if (STTD_ERROR_NONE != strncmp(STTE_RECOGNITION_TYPE_FREE_PARTIAL, recognition_type, STT_MAX_TYPE_LENGTH)) { + if (STTD_ERROR_NONE != strncmp(STTE_RECOGNITION_TYPE_FREE_PARTIAL, recognition_type, strlen(STTE_RECOGNITION_TYPE_FREE_PARTIAL) + 1)) { if (NULL == g_processing_timer) { g_recording_timer = ecore_timer_add(g_recording_timeout, __stop_by_recording_timeout, NULL); } @@ -1474,7 +1474,7 @@ int sttd_server_start_audio_streaming(unsigned int uid, const char* lang, const return ret; } - if (STTD_ERROR_NONE != strncmp(STTE_RECOGNITION_TYPE_FREE_PARTIAL, recognition_type, STT_MAX_TYPE_LENGTH)) { + if (STTD_ERROR_NONE != strncmp(STTE_RECOGNITION_TYPE_FREE_PARTIAL, recognition_type, strlen(STTE_RECOGNITION_TYPE_FREE_PARTIAL) + 1)) { if (NULL == g_processing_timer) { g_recording_timer = ecore_timer_add(g_recording_timeout, __stop_by_recording_timeout, NULL); } diff --git a/server/stte.c b/server/stte.c index c2619c8..cbf4128 100755 --- a/server/stte.c +++ b/server/stte.c @@ -160,7 +160,7 @@ static bool __is_default_engine() } SLOG(LOG_DEBUG, TAG_STTD, "[Server] STT Default Engine(%s), appId(%s)", engine, appid); - if (0 == strncmp(engine, appid, strlen(engine))) { + if (0 == strncmp(engine, appid, strlen(engine) + 1)) { free(engine); return TRUE; }