From 937518c98b622ea4b21e6fbe78f97b00f7e8b804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Thu, 10 Jul 2025 14:47:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- services/audiomanager/managersink/src/daudio_sink_manager.cpp | 4 ++++ services/audiomanager/managersource/src/dmic_dev.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 1e671e06..01d480db 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -491,6 +491,10 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) #ifdef DEVICE_SECURITY_LEVEL_ENABLE DeviceIdentify devIdentify; devIdentify.length = DEVICE_ID_MAX_LEN; + if (udid.size() > DEVICE_ID_MAX_LEN) { + DHLOGE("udid size exceeds DEVICE_ID_MAX_LEN"); + return DEFAULT_DEVICE_SECURITY_LEVEL; + } int32_t ret = memcpy_s(devIdentify.identity, DEVICE_ID_MAX_LEN, udid.c_str(), DEVICE_ID_MAX_LEN); if (ret != DH_SUCCESS) { DHLOGE("Str copy failed %{public}d", ret); diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index a1cbbfc8..daac1b46 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -625,6 +625,10 @@ void DMicDev::FillJitterQueue() while (isEnqueueRunning_.load()) { { std::lock_guard lock(dataQueueMtx_); + if (paramHDF_.period == 0) { + DHLOGE("DMicDev paramHDF_.period is zero"); + break; + } if (dataQueue_.size() >= (LOW_LATENCY_JITTER_TIME_MS / paramHDF_.period)) { break; } -- Gitee From b5258063fa68876a959ad1ed4190099761a4cb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Mon, 14 Jul 2025 16:43:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../audiomanager/managersink/src/daudio_sink_manager.cpp | 2 +- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 01d480db..f6b8d593 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -491,7 +491,7 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) #ifdef DEVICE_SECURITY_LEVEL_ENABLE DeviceIdentify devIdentify; devIdentify.length = DEVICE_ID_MAX_LEN; - if (udid.size() > DEVICE_ID_MAX_LEN) { + if (udid.size() >= DEVICE_ID_MAX_LEN) { DHLOGE("udid size exceeds DEVICE_ID_MAX_LEN"); return DEFAULT_DEVICE_SECURITY_LEVEL; } diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index a8d44f81..399f9095 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -339,7 +339,10 @@ HWTEST_F(DMicDevTest, ReadStreamData_001, TestSize.Level1) } mic_->isEnqueueRunning_ = true; mic_->FillJitterQueue(); - + mic_->paramHDF_.period = 0; + mic_->FillJitterQueue(); + mic_->paramHDF_.period = 1; + mic_->FillJitterQueue(); std::shared_ptr readData1 = nullptr; EXPECT_EQ(DH_SUCCESS, mic_->ReadStreamData(streamId_, readData1)); -- Gitee