openharmony/js_util_module
1
0
Fork 0
mirror of https://github.com/openharmony/js_util_module.git synced 2026-07-19 18:23:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix code bugs

Browse Source 
Signed-off-by: xdmal <maxiaodong16@huawei.com>
This commit is contained in:
xdmal
2022-02-28 15:35:18 +08:00
parent 6313e90208
commit a0430f80f6
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/native_module_util.cpp
+21 -10
View File
@@ -33,6 +33,9 @@ extern const char _binary_util_abc_end[];
namespace OHOS::Util {
static char* ApplyMemory(const size_t length)
{
if (length <= 0) {
return nullptr;
}
char *type = new char[length + 1];
if (memset_s(type, length + 1, '\0', length + 1) != 0) {
HILOG_ERROR("type memset_s failed");
@@ -124,22 +127,30 @@ namespace OHOS::Util {
size_t argc = 0;
napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr);
napi_value *argv = nullptr;
NAPI_ASSERT(env, argc > 0, "argc == 0");
argv = new napi_value[argc + 1];
if (memset_s(argv, argc + 1, 0, argc + 1) != 0) {
HILOG_ERROR("argv memset error");
delete []argv;
if (argc > 0) {
argv = new napi_value[argc + 1];
if (memset_s(argv, argc + 1, 0, argc + 1) != 0) {
HILOG_ERROR("argv memset error");
delete []argv;
return nullptr;
}
} else {
return nullptr;
}
napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr);
char *format = nullptr;
size_t formatsize = 0;
napi_get_value_string_utf8(env, argv[0], nullptr, 0, &formatsize);
NAPI_ASSERT(env, formatsize > 0, "formatsize == 0");
format = new char[formatsize + 1];
if (memset_s(format, formatsize + 1, 0, formatsize + 1) != 0) {
HILOG_ERROR("format memset error");
delete []format;
if (formatsize > 0) {
format = new char[formatsize + 1];
if (memset_s(format, formatsize + 1, 0, formatsize + 1) != 0) {
HILOG_ERROR("format memset error");
delete []format;
delete []argv;
return nullptr;
}
} else {
delete []argv;
return nullptr;
}
napi_get_value_string_utf8(env, argv[0], format, formatsize + 1, &formatsize);