From 8ab4264b98e1bfb49a532bcf4d51c473341cc31d Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Tue, 4 Feb 2025 17:06:39 +0900 Subject: [PATCH] Fix issues that detected by static analysis tool Change-Id: I837f33c0dddc37a5230f0accd195921e8a996de1 Signed-off-by: sungwook79.park --- server/PlayerThread.cpp | 6 ++++-- server/ttsd_data.cpp | 2 +- server/ttsd_engine_agent.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/PlayerThread.cpp b/server/PlayerThread.cpp index 95ef6003..51fc37b3 100644 --- a/server/PlayerThread.cpp +++ b/server/PlayerThread.cpp @@ -44,7 +44,7 @@ PlayerThread::PlayerThread(PlayUtteranceCallback threadFucntion) PlayerThread::~PlayerThread() { SLOG(LOG_INFO, tts_tag(), "[PlayerThread] Destructor"); - unique_lock controlLock(mControlMutex); + lock_guard controlLock(mControlMutex); mPlayerAvailable = false; mPlayUtterance = nullptr; @@ -52,7 +52,9 @@ PlayerThread::~PlayerThread() SLOG(LOG_INFO, tts_tag(), "[PlayerThread] Thread is stopped or waiting"); mThreadCond.notify_all(); - mPlayerThread.join(); + if (mPlayerThread.joinable()) { + mPlayerThread.join(); + } SLOG(LOG_INFO, tts_tag(), "[PlayerThread] Finish thread"); } diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp index fe1eb2a2..bf9cddce 100644 --- a/server/ttsd_data.cpp +++ b/server/ttsd_data.cpp @@ -930,7 +930,7 @@ int ttsd_data_foreach_clients(ttsd_data_get_client_cb callback, void* user_data) app.utt_id_stopped = 0; app.state = g_app_list[i].state; - temp_app_list.push_back(app); + temp_app_list.push_back(std::move(app)); } lock.unlock(); diff --git a/server/ttsd_engine_agent.c b/server/ttsd_engine_agent.c index 443a6879..a7940136 100644 --- a/server/ttsd_engine_agent.c +++ b/server/ttsd_engine_agent.c @@ -231,6 +231,7 @@ int ttsd_engine_agent_init(ttse_request_callback_s *callback) /* Set default voice */ if (temp->default_lang) { free(temp->default_lang); + temp->default_lang = NULL; } temp->default_lang = strdup(TTS_BASE_LANGUAGE); temp->default_vctype = TTSE_VOICE_TYPE_FEMALE; @@ -652,7 +653,7 @@ bool ttsd_engine_select_valid_voice(const char* lang, int type, const char* ptts result = true; } } - } else if (0 == strncmp(lang, "default", strlen("default")) && 0 != type) { + } else if (0 == strncmp(lang, "default", strlen("default") + 1) && 0 != type) { /* Only lang is default */ if (type == g_engine_info->default_vctype) { // default type != personal_type *out_lang = strdup(g_engine_info->default_lang); -- 2.34.1