diff --git a/frameworks/kits/js/common/ndk/BUILD.gn b/frameworks/kits/js/common/ndk/BUILD.gn index 4ae74a8fed681fac47c63b69827d3765595899e6..c7beb4e8e7c5167da5c153b9ad2a39f54bf0e180 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 71f38ab05ced11c8fff33df0730095c2abe8533a..34be04c6aaa40005365ecec14a5e0850451e3421 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 7c2bb72b4c34da28280e34ca2e2036b512a447fa..8c080abf08c82e914adf4ef7351876ac6dd762bd 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++; }