From 392524c34ae4dad3ab742da80ed22a24853a28b7 Mon Sep 17 00:00:00 2001 From: fanzhihao8 Date: Wed, 16 Jul 2025 21:19:39 +0800 Subject: [PATCH 1/4] fix bug for codecheck Signed-off-by: fanzhihao8 --- .../innerkitsimpl/stream/src/file_source_stream.cpp | 10 ++++++++-- frameworks/innerkitsimpl/utils/src/image_utils.cpp | 4 ++++ .../libextplugin/src/hardware/jpeg_hw_decoder.cpp | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp index ffe748527..f86ea4326 100644 --- a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp +++ b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp @@ -431,11 +431,17 @@ OutputDataStream* FileSourceStream::ToOutputDataStream() if (filePtr_ == nullptr) { return nullptr; } - if (DupFd(filePtr_, dupFd)) { + if (!DupFd(filePtr_, dupFd)) { IMAGE_LOGE("[FileSourceStream] ToOutputDataStream fd failed"); return nullptr; } - return new (std::nothrow) FilePackerStream(dupFd); + // return new (std::nothrow) FilePackerStream(dupFd); + OutputDataStream* stream = new (std::nothrow) FilePackerStream(dupFd); + if (!stream) { + close(dupFd); + return nullptr; + } + return stream; } int FileSourceStream::GetMMapFd() diff --git a/frameworks/innerkitsimpl/utils/src/image_utils.cpp b/frameworks/innerkitsimpl/utils/src/image_utils.cpp index c5f89405a..fa126fca7 100644 --- a/frameworks/innerkitsimpl/utils/src/image_utils.cpp +++ b/frameworks/innerkitsimpl/utils/src/image_utils.cpp @@ -806,6 +806,10 @@ std::string ImageUtils::GetLocalTime() auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; std::time_t t = std::chrono::system_clock::to_time_t(now); std::tm tm = *std::localtime(&t); + if (!tm) { + IMAGE_LOGE("ImageUtils::GetLocalTime error, returned nullptr"); + return ""; + } std::stringstream ss; int millSecondWidth = 3; diff --git a/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp b/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp index 42ff4c424..ccea55968 100644 --- a/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp +++ b/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp @@ -267,7 +267,7 @@ bool JpegHardwareDecoder::HuffmanTblTransform(JHUFF_TBL* huffTbl, CodecJpegHuffT actualHuffValLen += huffTbl->bits[i]; } JPEG_HW_LOGD("actualHuffValLen=%{public}d", actualHuffValLen); - if (actualHuffValLen > MAX_LIST_HUFFVAL_LEN) { + if (actualHuffValLen >= MAX_LIST_HUFFVAL_LEN) { JPEG_HW_LOGE("invalid huffVal len: %{public}d", actualHuffValLen); return false; } -- Gitee From 6b0e886387a5ee62a3feb398996e62186e2abd2e Mon Sep 17 00:00:00 2001 From: fanzhihao8 Date: Thu, 17 Jul 2025 10:58:14 +0800 Subject: [PATCH 2/4] fix bug for codecheck Signed-off-by: fanzhihao8 --- frameworks/innerkitsimpl/stream/src/file_source_stream.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp index f86ea4326..6376d206f 100644 --- a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp +++ b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp @@ -435,7 +435,6 @@ OutputDataStream* FileSourceStream::ToOutputDataStream() IMAGE_LOGE("[FileSourceStream] ToOutputDataStream fd failed"); return nullptr; } - // return new (std::nothrow) FilePackerStream(dupFd); OutputDataStream* stream = new (std::nothrow) FilePackerStream(dupFd); if (!stream) { close(dupFd); -- Gitee From f61a5f75fab759c3371432a8c3d921a8ae772165 Mon Sep 17 00:00:00 2001 From: fanzhihao8 Date: Thu, 17 Jul 2025 14:34:00 +0800 Subject: [PATCH 3/4] fix bug for codecheck Signed-off-by: fanzhihao8 --- frameworks/innerkitsimpl/utils/src/image_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkitsimpl/utils/src/image_utils.cpp b/frameworks/innerkitsimpl/utils/src/image_utils.cpp index fa126fca7..f30112cd0 100644 --- a/frameworks/innerkitsimpl/utils/src/image_utils.cpp +++ b/frameworks/innerkitsimpl/utils/src/image_utils.cpp @@ -806,7 +806,7 @@ std::string ImageUtils::GetLocalTime() auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; std::time_t t = std::chrono::system_clock::to_time_t(now); std::tm tm = *std::localtime(&t); - if (!tm) { + if (tm == nullptr) { IMAGE_LOGE("ImageUtils::GetLocalTime error, returned nullptr"); return ""; } -- Gitee From 09d029020f6f5906a442df6e7f562689f0c1937a Mon Sep 17 00:00:00 2001 From: fanzhihao8 Date: Thu, 17 Jul 2025 18:46:27 +0800 Subject: [PATCH 4/4] fix bug for codecheck Signed-off-by: fanzhihao8 --- frameworks/innerkitsimpl/utils/src/image_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkitsimpl/utils/src/image_utils.cpp b/frameworks/innerkitsimpl/utils/src/image_utils.cpp index f30112cd0..a6407d929 100644 --- a/frameworks/innerkitsimpl/utils/src/image_utils.cpp +++ b/frameworks/innerkitsimpl/utils/src/image_utils.cpp @@ -806,8 +806,8 @@ std::string ImageUtils::GetLocalTime() auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; std::time_t t = std::chrono::system_clock::to_time_t(now); std::tm tm = *std::localtime(&t); - if (tm == nullptr) { - IMAGE_LOGE("ImageUtils::GetLocalTime error, returned nullptr"); + if (tm == NULL) { + IMAGE_LOGE("ImageUtils::GetLocalTime error, returned NULL"); return ""; } -- Gitee