From 6e2d658be389506aa5fb5024250165276a468a04 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Thu, 5 Nov 2020 18:58:07 +0900 Subject: [PATCH] Fix build error and Update version (1.60.12) Change-Id: I632d19dfe19f984cf92c62c4a7a3cc28773866e0 Signed-off-by: sooyeon.kim --- CMakeLists.txt | 2 +- packaging/tts.spec | 2 +- server/ttsd_data.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04d9d9c..59c9bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ PROJECT(tts) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}") SET(INCLUDEDIR "${PREFIX}/include") -SET(VERSION 1.60.11) +SET(VERSION 1.60.12) FIND_PROGRAM(UNAME NAMES uname) EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") diff --git a/packaging/tts.spec b/packaging/tts.spec index 3055a41..2452158 100644 --- a/packaging/tts.spec +++ b/packaging/tts.spec @@ -1,6 +1,6 @@ Name: tts Summary: Text To Speech client library and daemon -Version: 1.60.11 +Version: 1.60.12 Release: 1 Group: Graphics & UI Framework/Voice Framework License: Apache-2.0 diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp index 2b649b0..354cd26 100644 --- a/server/ttsd_data.cpp +++ b/server/ttsd_data.cpp @@ -359,7 +359,8 @@ int ttsd_data_add_speak_data(int uid, speak_data_s* data) SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), index(%d), m_speak_data size(%d)", uid, index, g_app_list[index].m_speak_data.size()); try { - if (index < g_app_list.size()) { + int vsize = g_app_list.size(); + if (index < vsize) { SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), text(%s), lang(%s), vctype(%d), speed(%d)", *iter, (*iter)->utt_id, (*iter)->text, (*iter)->lang, (*iter)->vctype, (*iter)->speed); @@ -454,7 +455,8 @@ int ttsd_data_add_sound_data(int uid, sound_data_s* data) SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), index(%d), m_wav_data size(%d)", uid, index, g_app_list[index].m_wav_data.size()); try { - if (index < g_app_list.size()) { + int vsize = g_app_list.size(); + if (index < vsize) { SLOG(LOG_ERROR, tts_tag(), "[DATA INFO] [%p] utt_id(%d), data(%p) data size(%d), type(%d)", *iter, (*iter)->utt_id, (*iter)->data, (*iter)->data_size, (*iter)->audio_type); iter = g_app_list[index].m_wav_data.insert(g_app_list[index].m_wav_data.end(), data); } else { -- 2.7.4