diff --git a/src/daemon/modules/network/cni_operator/libcni/invoke/libcni_errno.c b/src/daemon/modules/network/cni_operator/libcni/invoke/libcni_errno.c index 8b97fd6b22e3cc17a0584c23545555bad7603af5..efdcfbc7d2a6a3ce92a1fca5199f734433ce97e6 100644 --- a/src/daemon/modules/network/cni_operator/libcni/invoke/libcni_errno.c +++ b/src/daemon/modules/network/cni_operator/libcni/invoke/libcni_errno.c @@ -14,16 +14,7 @@ **********************************************************************************/ #define _GNU_SOURCE #include "libcni_errno.h" -#include -#include -#include #include -#include -#include -#include -#include -#include -#include #include "isula_libutils/log.h" @@ -41,8 +32,8 @@ const char * const g_INVOKE_ERR_MSGS[] = { const char *get_invoke_err_msg(int errcode) { - if (errcode <= INK_ERR_SUCCESS) { - return g_INVOKE_ERR_MSGS[errcode - (INK_ERR_MIN)]; + if (errcode > (int)INK_ERR_MIN && errcode <= (int)INK_ERR_SUCCESS) { + return g_INVOKE_ERR_MSGS[errcode - (int)INK_ERR_MIN]; } return strerror(errcode); } @@ -81,12 +72,12 @@ const char * const g_CNI_CUSTOM_ERR_MSGS[] = { const char *get_cni_err_msg(unsigned int errcode) { - if (errcode < CNI_ERR_MAX) { + if (errcode < (unsigned int)CNI_ERR_MAX) { return g_CNI_WELL_KNOWN_ERR_MSGS[errcode]; } - if (errcode > CUSTOM_ERR_MIN && errcode < CUSTOM_ERR_MAX) { - return g_CNI_CUSTOM_ERR_MSGS[errcode - CUSTOM_ERR_MIN]; + if (errcode >= (unsigned int)CUSTOM_ERR_MIN && errcode < (unsigned int)CUSTOM_ERR_MAX) { + return g_CNI_CUSTOM_ERR_MSGS[errcode - (unsigned int)CUSTOM_ERR_MIN]; } return UNDEFINE_ERR; diff --git a/test/fuzz/CMakeLists.txt b/test/fuzz/CMakeLists.txt index 555c3813ae8470751be0035a4c75e7895187e692..8561b495e51154d06d2a403157a79d07d6ad6cd5 100644 --- a/test/fuzz/CMakeLists.txt +++ b/test/fuzz/CMakeLists.txt @@ -1,6 +1,6 @@ project(iSulad_UT) -execute_process(COMMAND bash "-c" "find /usr -name *libclang_rt.fuzzer-${CMAKE_HOST_SYSTEM_PROCESSOR}*" +execute_process(COMMAND bash "-c" "find /usr -name *libclang_rt.fuzzer-${CMAKE_HOST_SYSTEM_PROCESSOR}* | head -1" OUTPUT_VARIABLE LIB_FUZZING_ENGINE OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -69,33 +69,33 @@ add_executable(${EXE4} test_volume_parse_volume_fuzz.cc ) add_executable(${EXE5} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_string.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_array.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_file.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_convert.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_verify.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_regex.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_pwgr.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/sha256/sha256.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map/map.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map/rb_tree.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/path.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_string.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_array.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_file.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_convert.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_verify.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_regex.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_pwgr.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/sha256/sha256.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/map/map.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/map/rb_tree.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/path.c test_pw_obj_parser_fuzz.cc ) add_executable(${EXE6} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_string.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_array.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_file.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_convert.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_verify.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_regex.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/utils_pwgr.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/sha256/sha256.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map/map.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map/rb_tree.c - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/path.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_string.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_array.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_file.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_convert.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_verify.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_regex.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/utils_pwgr.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/sha256/sha256.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/map/map.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/map/rb_tree.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/path.c test_gr_obj_parser_fuzz.cc ) diff --git a/test/fuzz/test_gr_obj_parser_fuzz.cc b/test/fuzz/test_gr_obj_parser_fuzz.cc index 01db0cf24ba72b38803b14123982ad58f5642d13..d43d153d23b6075d4b955693d6452fad95937938 100644 --- a/test/fuzz/test_gr_obj_parser_fuzz.cc +++ b/test/fuzz/test_gr_obj_parser_fuzz.cc @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. * iSulad licensed under the Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/test/fuzz/test_pw_obj_parser_fuzz.cc b/test/fuzz/test_pw_obj_parser_fuzz.cc index 3a2195c6b68e9a8fcca523649cbf2b9db68bb148..cf09f57672fd5fa1f5651f38878a095291d0f1c2 100644 --- a/test/fuzz/test_pw_obj_parser_fuzz.cc +++ b/test/fuzz/test_pw_obj_parser_fuzz.cc @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. * iSulad licensed under the Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/test/mocks/oci_image_mock.cc b/test/mocks/oci_image_mock.cc index 8e975e3bb89dfd2318a12643c7cc6e5f5e8a3266..c333c0dd4eb5dc5323803811166c66e4faa2155c 100644 --- a/test/mocks/oci_image_mock.cc +++ b/test/mocks/oci_image_mock.cc @@ -37,5 +37,5 @@ struct oci_image_module_data *get_oci_image_data(void) if (g_oci_image_mock != nullptr) { return g_oci_image_mock->GetOciImageData(); } - return { 0 }; + return nullptr; }