From 24098ab4cb79183cdfdb6b222d53b8224ac7bac2 Mon Sep 17 00:00:00 2001 From: baosiyuan Date: Wed, 4 Jun 2025 10:29:00 +0800 Subject: [PATCH] Modify security alerts Signed-off-by: baosiyuan Change-Id: Ifdc9f9df15186758f7591ff445cb0443cfa3d998 --- frameworks/kits/js/common/ndk/BUILD.gn | 1 + frameworks/kits/js/common/ndk/image_packer_native.cpp | 4 ++++ frameworks/kits/js/common/ndk/image_source_native.cpp | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/frameworks/kits/js/common/ndk/BUILD.gn b/frameworks/kits/js/common/ndk/BUILD.gn index 4ae74a8fe..c7beb4e8e 100644 --- a/frameworks/kits/js/common/ndk/BUILD.gn +++ b/frameworks/kits/js/common/ndk/BUILD.gn @@ -200,6 +200,7 @@ ohos_shared_library("image_packer") { external_deps = [ "c_utils:utils", + "hilog:libhilog", "napi:ace_napi", "resource_management:librawfile", ] diff --git a/frameworks/kits/js/common/ndk/image_packer_native.cpp b/frameworks/kits/js/common/ndk/image_packer_native.cpp index 71f38ab05..34be04c6a 100644 --- a/frameworks/kits/js/common/ndk/image_packer_native.cpp +++ b/frameworks/kits/js/common/ndk/image_packer_native.cpp @@ -720,6 +720,10 @@ Image_ErrorCode OH_ImagePackerNative_GetSupportedFormats(Image_MimeType** suppor size_t count = 0; for (const auto& str : formats) { (*supportedFormat)[count].data = strdup(str.c_str()); + if ((*supportedFormat)[count].data == nullptr) { + IMAGE_LOGE("ImagePacker strdup failed"); + continue; + } (*supportedFormat)[count].size = str.size(); count++; } diff --git a/frameworks/kits/js/common/ndk/image_source_native.cpp b/frameworks/kits/js/common/ndk/image_source_native.cpp index 7c2bb72b4..8c080abf0 100644 --- a/frameworks/kits/js/common/ndk/image_source_native.cpp +++ b/frameworks/kits/js/common/ndk/image_source_native.cpp @@ -995,6 +995,10 @@ Image_ErrorCode OH_ImageSourceNative_GetSupportedFormats(Image_MimeType** suppor size_t count = 0; for (const auto& str : formats) { (*supportedFormat)[count].data = strdup(str.c_str()); + if ((*supportedFormat)[count].data == nullptr) { + IMAGE_LOGE("ImageSource strdup failed"); + continue; + } (*supportedFormat)[count].size = str.size(); count++; } -- Gitee