From f6c2feffeb9ed9222b257199c09e96d535e38167 Mon Sep 17 00:00:00 2001 From: Sejun Park Date: Thu, 14 Nov 2024 11:10:07 +0900 Subject: [PATCH] add code to handle the case where engine id is a null ptr Change-Id: If1544b1d85ff47cdddb6740b6cb413aa2e6435cc --- common/VoiceControlConfig.cpp | 5 +++++ packaging/voice-control.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/VoiceControlConfig.cpp b/common/VoiceControlConfig.cpp index 9f754b2..e737792 100644 --- a/common/VoiceControlConfig.cpp +++ b/common/VoiceControlConfig.cpp @@ -60,10 +60,15 @@ void VoiceControlConfig::setEngineId(const std::string engineId) } free(mConfig->engine_id); + mConfig->engine_id = nullptr; if (engineId.empty()) { mConfig->engine_id = nullptr; } else { mConfig->engine_id = strdup(engineId.c_str()); + if (mConfig->engine_id == nullptr) { + SLOG(LOG_ERROR, TAG_VCCONFIG, "[ERROR] Memory allocation failed"); + return; + } } SLOG(LOG_ERROR, TAG_VCCONFIG, "Set Engine ID : %s", mConfig->engine_id); } diff --git a/packaging/voice-control.spec b/packaging/voice-control.spec index b6c20b8..9f190e6 100644 --- a/packaging/voice-control.spec +++ b/packaging/voice-control.spec @@ -1,6 +1,6 @@ Name: voice-control Summary: Voice control client library and daemon -Version: 1.90.5 +Version: 1.90.6 Release: 1 Group: Graphics & UI Framework/Voice Framework License: Apache-2.0 -- 2.34.1