From 249067e354a29034fc7f97e7604f69e9cceed778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 23 Jul 2025 17:20: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=E4=BB=93=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E6=A3=80?= =?UTF-8?q?=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../av_trans_audio_encoder_filter_test.cpp | 1 + av_transport/common/src/av_trans_utils.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/av_transport/av_trans_engine/filters/test/av_trans_coder_filter_test/av_trans_audio_encoder_filter_test.cpp b/av_transport/av_trans_engine/filters/test/av_trans_coder_filter_test/av_trans_audio_encoder_filter_test.cpp index 65f7b392..c3de3cee 100644 --- a/av_transport/av_trans_engine/filters/test/av_trans_coder_filter_test/av_trans_audio_encoder_filter_test.cpp +++ b/av_transport/av_trans_engine/filters/test/av_trans_coder_filter_test/av_trans_audio_encoder_filter_test.cpp @@ -601,6 +601,7 @@ HWTEST_F(AvTransportAudioEncoderFilterTest, OnEncOutputFormatChanged, testing::e filter->OnEncOutputFormatChanged(nullFormat); OH_AVFormat *validFormat = new (std::nothrow) OH_AVFormat(); filter->OnEncOutputFormatChanged(validFormat); + delete validFormat; } HWTEST_F(AvTransportAudioEncoderFilterTest, OnEncInputBufferAvailable_002, testing::ext::TestSize.Level1) diff --git a/av_transport/common/src/av_trans_utils.cpp b/av_transport/common/src/av_trans_utils.cpp index 38b0b2cf..dd72f8aa 100644 --- a/av_transport/common/src/av_trans_utils.cpp +++ b/av_transport/common/src/av_trans_utils.cpp @@ -260,6 +260,7 @@ bool IsUInt32(const cJSON *jsonObj, const std::string &key) { cJSON *keyObj = cJSON_GetObjectItemCaseSensitive(jsonObj, key.c_str()); return (keyObj != nullptr) && cJSON_IsNumber(keyObj) && + (keyObj->valueint >= 0) && static_cast(keyObj->valueint) <= UINT32_MAX; } @@ -267,8 +268,8 @@ bool IsInt64(const cJSON *jsonObj, const std::string &key) { cJSON *keyObj = cJSON_GetObjectItemCaseSensitive(jsonObj, key.c_str()); return (keyObj != nullptr) && cJSON_IsNumber(keyObj) && - static_cast(keyObj->valueint) <= INT64_MAX && - static_cast(keyObj->valueint) >= INT64_MIN; + (keyObj->valuedouble) <= INT64_MAX && + (keyObj->valuedouble) >= INT64_MIN; } bool IsString(const cJSON *jsonObj, const std::string &key) -- Gitee From 444324c09e35c343f3404058e9c999a98eeb0d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Mon, 28 Jul 2025 18:46:31 +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=E4=BB=93=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E6=A3=80?= =?UTF-8?q?=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- av_transport/common/src/av_trans_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/av_transport/common/src/av_trans_utils.cpp b/av_transport/common/src/av_trans_utils.cpp index dd72f8aa..94c78e89 100644 --- a/av_transport/common/src/av_trans_utils.cpp +++ b/av_transport/common/src/av_trans_utils.cpp @@ -268,8 +268,8 @@ bool IsInt64(const cJSON *jsonObj, const std::string &key) { cJSON *keyObj = cJSON_GetObjectItemCaseSensitive(jsonObj, key.c_str()); return (keyObj != nullptr) && cJSON_IsNumber(keyObj) && - (keyObj->valuedouble) <= INT64_MAX && - (keyObj->valuedouble) >= INT64_MIN; + static_cast(keyObj->valuedouble) <= INT64_MAX && + static_cast(keyObj->valuedouble) >= INT64_MIN; } bool IsString(const cJSON *jsonObj, const std::string &key) -- Gitee