From: Kwangyoun Kim Date: Fri, 5 Aug 2016 05:51:16 +0000 (-0700) Subject: Merge "Fix bug about checking privilege" into tizen X-Git-Tag: accepted/tizen/common/20160824.155300~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6aed48b1a283015e0948fa4b37578c80bd921fe;hp=a9f7605b6bbfd935b4e5c9cb96bd74dd2483c0c7;p=platform%2Fcore%2Fuifw%2Fstt.git Merge "Fix bug about checking privilege" into tizen --- diff --git a/client/stt.c b/client/stt.c index daf4ce3..163d67a 100644 --- a/client/stt.c +++ b/client/stt.c @@ -533,6 +533,7 @@ int stt_set_engine(stt_h stt, const char* engine_id) if (NULL != client->current_engine_id) { free(client->current_engine_id); + client->current_engine_id = NULL; } SLOG(LOG_DEBUG, TAG_STTC, "===== engined_id(%s)", engine_id); @@ -740,6 +741,7 @@ static Eina_Bool __stt_connect_daemon(void *data) SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s), credential(%s)", silence_supported ? "support" : "no support", credential_needed ? "need" : "no need"); } +#ifdef __UNUSED_CODES__ if (NULL != client->current_engine_id) { ret = -1; int count = 0; @@ -771,7 +773,7 @@ static Eina_Bool __stt_connect_daemon(void *data) } } } - +#endif SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] uid(%d)", client->uid); client->before_state = client->current_state; @@ -955,6 +957,7 @@ int stt_foreach_supported_languages(stt_h stt, stt_supported_language_cb callbac if (NULL != current_engine_id) { free(current_engine_id); + current_engine_id = NULL; } client->supported_lang_cb = NULL; diff --git a/client/stt_file.c b/client/stt_file.c index 86c3471..e95b3c3 100644 --- a/client/stt_file.c +++ b/client/stt_file.c @@ -463,7 +463,10 @@ int stt_file_initialize(void) } } - if (NULL != engine_id) free(engine_id); + if (NULL != engine_id) { + free(engine_id); + engine_id = NULL; + } if (false == is_found) { engine = NULL; diff --git a/common/stt_config_mgr.c b/common/stt_config_mgr.c index eaa6fe0..c9b7870 100644 --- a/common/stt_config_mgr.c +++ b/common/stt_config_mgr.c @@ -1062,13 +1062,16 @@ int stt_config_mgr_set_engine(const char* engine) continue; } - if (NULL != g_config_info->engine_id) + if (NULL != g_config_info->engine_id) { free(g_config_info->engine_id); + g_config_info->engine_id = NULL; + } g_config_info->engine_id = strdup(engine); if (NULL != g_config_info->setting) { free(g_config_info->setting); + g_config_info->setting = NULL; } if (NULL != engine_info->setting) { diff --git a/common/stt_config_parser.c b/common/stt_config_parser.c index a881174..50de74c 100644 --- a/common/stt_config_parser.c +++ b/common/stt_config_parser.c @@ -437,9 +437,18 @@ int stt_parser_unload_config(stt_config_s* config_info) { if (NULL != g_config_doc) xmlFreeDoc(g_config_doc); if (NULL != config_info) { - if (NULL != config_info->engine_id) free(config_info->engine_id); - if (NULL != config_info->setting) free(config_info->setting); - if (NULL != config_info->language) free(config_info->language); + if (NULL != config_info->engine_id) { + free(config_info->engine_id); + config_info->engine_id = NULL; + } + if (NULL != config_info->setting) { + free(config_info->setting); + config_info->setting = NULL; + } + if (NULL != config_info->language) { + free(config_info->language); + config_info->language = NULL; + } free(config_info); } diff --git a/server/sttd_dbus_server.c b/server/sttd_dbus_server.c index a4469e6..2daf8ee 100644 --- a/server/sttd_dbus_server.c +++ b/server/sttd_dbus_server.c @@ -215,11 +215,21 @@ int sttd_dbus_server_get_support_engines(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Engine info is NULL"); } - if (NULL != engine->engine_id) free(engine->engine_id); - if (NULL != engine->engine_name) free(engine->engine_name); - if (NULL != engine->ug_name) free(engine->ug_name); + if (NULL != engine->engine_id) { + free(engine->engine_id); + engine->engine_id = NULL; + } + if (NULL != engine->engine_name) { + free(engine->engine_name); + engine->engine_name = NULL; + } + if (NULL != engine->ug_name) { + free(engine->ug_name); + engine->ug_name = NULL; + } free(engine); + engine = NULL; } else { SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Engine info is NULL"); } diff --git a/server/sttd_recorder.c b/server/sttd_recorder.c index dc5f660..5c4687b 100644 --- a/server/sttd_recorder.c +++ b/server/sttd_recorder.c @@ -72,9 +72,9 @@ static int g_count = 1; #endif #ifdef TV_BT_MODE -static float get_volume_decibel(char* data, int size, sttp_audio_type_e type); +static float get_volume_decibel(char* data, int size, stte_audio_type_e type); -static stt_recorder_s* __get_recorder(int engine_id); +//static stt_recorder_s* __get_recorder(int engine_id); static int g_bt_extend_count; diff --git a/server/sttd_server.c b/server/sttd_server.c index b39402f..a3b528e 100644 --- a/server/sttd_server.c +++ b/server/sttd_server.c @@ -24,8 +24,8 @@ #include "sttd_recorder.h" #include "sttd_server.h" -static pthread_mutex_t sttpe_result_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t sttpe_result_time_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t stte_result_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t stte_result_time_mutex = PTHREAD_MUTEX_INITIALIZER; /* @@ -183,7 +183,7 @@ void __server_recognition_result_callback(stte_result_event_e event, const char* const char** data, int data_count, const char* msg, void *user_data) { // critical section - pthread_mutex_lock(&sttpe_result_mutex); + pthread_mutex_lock(&stte_result_mutex); SLOG(LOG_DEBUG, TAG_STTD, "===== RESULT event[%d] type[%s] data[%p] data_count[%d]", event, type, data, data_count); @@ -195,7 +195,7 @@ void __server_recognition_result_callback(stte_result_event_e event, const char* SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] uid is NOT valid "); SLOG(LOG_DEBUG, TAG_STTD, "====="); SLOG(LOG_DEBUG, TAG_STTD, " "); - pthread_mutex_unlock(&sttpe_result_mutex); + pthread_mutex_unlock(&stte_result_mutex); return; } @@ -285,14 +285,14 @@ void __server_recognition_result_callback(stte_result_event_e event, const char* SLOG(LOG_DEBUG, TAG_STTD, "====="); SLOG(LOG_DEBUG, TAG_STTD, " "); - pthread_mutex_unlock(&sttpe_result_mutex); + pthread_mutex_unlock(&stte_result_mutex); return; } bool __server_result_time_callback(int index, stte_result_time_event_e event, const char* text, long start_time, long end_time, void* user_data) { - pthread_mutex_lock(&sttpe_result_time_mutex); + pthread_mutex_lock(&stte_result_time_mutex); SLOG(LOG_DEBUG, TAG_STTD, "[Server] index(%d) event(%d) text(%s) start(%ld) end(%ld)", index, event, text, start_time, end_time); @@ -302,15 +302,15 @@ bool __server_result_time_callback(int index, stte_result_time_event_e event, co ret = sttd_config_time_add(index, (int)event, text, start_time, end_time); if (0 != ret) { SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to add time info"); - pthread_mutex_unlock(&sttpe_result_time_mutex); + pthread_mutex_unlock(&stte_result_time_mutex); return false; } } else { - pthread_mutex_unlock(&sttpe_result_time_mutex); + pthread_mutex_unlock(&stte_result_time_mutex); return false; } - pthread_mutex_unlock(&sttpe_result_time_mutex); + pthread_mutex_unlock(&stte_result_time_mutex); return true; } @@ -470,12 +470,12 @@ int sttd_initialize(stte_request_callback_s *callback) __register_sig_handler(); - if (0 != pthread_mutex_init(&sttpe_result_mutex, NULL)) { - SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to initialize sttpe result mutex."); + if (0 != pthread_mutex_init(&stte_result_mutex, NULL)) { + SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to initialize stte result mutex."); } - if (0 != pthread_mutex_init(&sttpe_result_time_mutex, NULL)) { - SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to initialize sttpe sttpe_result_time_mutex."); + if (0 != pthread_mutex_init(&stte_result_time_mutex, NULL)) { + SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to initialize stte stte_result_time_mutex."); } if (sttd_config_initialize(__sttd_server_engine_changed_cb, __sttd_server_language_changed_cb, @@ -511,12 +511,12 @@ int sttd_initialize(stte_request_callback_s *callback) int sttd_finalize() { - if (0 != pthread_mutex_destroy(&sttpe_result_mutex)) { - SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to destroy sttpe result mutex."); + if (0 != pthread_mutex_destroy(&stte_result_mutex)) { + SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to destroy stte result mutex."); } - if (0 != pthread_mutex_destroy(&sttpe_result_time_mutex)) { - SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to destroy sttpe_result_time_mutex."); + if (0 != pthread_mutex_destroy(&stte_result_time_mutex)) { + SLOG(LOG_ERROR, TAG_STTD, "[Server ERROR] Fail to destroy stte_result_time_mutex."); } GList *iter = NULL;