From 0b80c75804ba41c1318a83c4fce86bfc37e81980 Mon Sep 17 00:00:00 2001 From: gichan-jang Date: Fri, 14 Feb 2020 20:29:45 +0900 Subject: [PATCH] [Coverity] Fix resource leak CID : 1123780, 1123859.. Fix coverity issues caused by resource leak Signed-off-by: gichan-jang --- .../unittest_openvino.cc | 45 ++++++++++------------ tests/nnstreamer_plugins/unittest_plugins.cc | 27 +++++++------ 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/tests/nnstreamer_filter_openvino/unittest_openvino.cc b/tests/nnstreamer_filter_openvino/unittest_openvino.cc index 86e3b0f..ffdcbd4 100644 --- a/tests/nnstreamer_filter_openvino/unittest_openvino.cc +++ b/tests/nnstreamer_filter_openvino/unittest_openvino.cc @@ -98,6 +98,9 @@ TEST (tensor_filter_openvino, open_and_close_0) gchar *test_model; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -117,8 +120,6 @@ TEST (tensor_filter_openvino, open_and_close_0) prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ EXPECT_EQ (ret, 0); @@ -147,8 +148,6 @@ TEST (tensor_filter_openvino, open_and_close_0) prop->num_models = 2; prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ EXPECT_EQ (ret, 0); @@ -174,8 +173,6 @@ TEST (tensor_filter_openvino, open_and_close_0) prop->num_models = 1; prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ @@ -201,8 +198,6 @@ TEST (tensor_filter_openvino, open_and_close_0) prop->num_models = 1; prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ @@ -235,6 +230,9 @@ TEST (tensor_filter_openvino, open_and_close_1) gchar *test_model_bin; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -272,8 +270,6 @@ TEST (tensor_filter_openvino, open_and_close_1) prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ EXPECT_EQ (ret, 0); @@ -306,6 +302,9 @@ TEST (tensor_filter_openvino, open_and_close_2) gchar *test_model_bin; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -336,8 +335,6 @@ TEST (tensor_filter_openvino, open_and_close_2) prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ EXPECT_EQ (ret, 0); @@ -367,6 +364,9 @@ TEST (tensor_filter_openvino, open_and_close_0_n) gchar *test_model; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -386,8 +386,6 @@ TEST (tensor_filter_openvino, open_and_close_0_n) prop->num_models = 1; prop->accl_str = "true:cpu"; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); EXPECT_NE (ret, TensorFilterOpenvino::RetSuccess); EXPECT_EQ (ret, TensorFilterOpenvino::RetEInval); @@ -414,8 +412,6 @@ TEST (tensor_filter_openvino, open_and_close_0_n) prop->num_models = 2; prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); EXPECT_NE (ret, TensorFilterOpenvino::RetSuccess); EXPECT_EQ (ret, TensorFilterOpenvino::RetEInval); @@ -444,8 +440,6 @@ TEST (tensor_filter_openvino, open_and_close_0_n) prop->num_models = 2; prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); EXPECT_NE (ret, TensorFilterOpenvino::RetSuccess); EXPECT_EQ (ret, TensorFilterOpenvino::RetEInval); @@ -472,6 +466,9 @@ TEST (tensor_filter_openvino, open_and_close_1_n) gchar *test_model; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -490,8 +487,6 @@ TEST (tensor_filter_openvino, open_and_close_1_n) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); EXPECT_NE (ret, TensorFilterOpenvino::RetSuccess); EXPECT_EQ (ret, TensorFilterOpenvino::RetEInval); @@ -540,6 +535,9 @@ TEST (tensor_filter_openvino, open_and_close_2_n) gchar *test_model; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -558,8 +556,6 @@ TEST (tensor_filter_openvino, open_and_close_2_n) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); EXPECT_NE (ret, TensorFilterOpenvino::RetSuccess); EXPECT_EQ (ret, TensorFilterOpenvino::RetEInval); @@ -597,6 +593,9 @@ TEST (tensor_filter_openvino, getTensorDim_0) gchar *test_model; gint ret; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -616,8 +615,6 @@ TEST (tensor_filter_openvino, getTensorDim_0) prop->model_files = model_files; - ASSERT_TRUE (fw && fw->open && fw->close); - ret = fw->open (prop, &private_data); #ifdef __OPENVINO_CPU_EXT__ EXPECT_EQ (ret, 0); diff --git a/tests/nnstreamer_plugins/unittest_plugins.cc b/tests/nnstreamer_plugins/unittest_plugins.cc index 53a2c6a..01834c4 100644 --- a/tests/nnstreamer_plugins/unittest_plugins.cc +++ b/tests/nnstreamer_plugins/unittest_plugins.cc @@ -2958,6 +2958,9 @@ TEST (test_tensor_filter, reopen_tflite_02_p) const gchar *root_path = g_getenv ("NNSTREAMER_BUILD_ROOT_PATH"); gchar *test_model; + + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close); /* supposed to run test in build directory */ if (root_path == NULL) @@ -2979,8 +2982,6 @@ TEST (test_tensor_filter, reopen_tflite_02_p) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close); - /* open tf-lite model */ EXPECT_TRUE (fw->open (prop, &private_data) == 0); @@ -3106,6 +3107,9 @@ TEST (test_tensor_filter, reload_tflite_model_not_found_n) const gchar *root_path = g_getenv ("NNSTREAMER_BUILD_ROOT_PATH"); gchar *test_model; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -3127,8 +3131,6 @@ TEST (test_tensor_filter, reload_tflite_model_not_found_n) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); - /* open tf-lite model */ EXPECT_TRUE (fw->open (prop, &private_data) == 0); @@ -3168,6 +3170,9 @@ TEST (test_tensor_filter, reload_tflite_model_wrong_dims_n) const gchar *root_path = g_getenv ("NNSTREAMER_BUILD_ROOT_PATH"); gchar *test_model; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -3189,8 +3194,6 @@ TEST (test_tensor_filter, reload_tflite_model_wrong_dims_n) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); - /* open tf-lite model */ EXPECT_TRUE (fw->open (prop, &private_data) == 0); @@ -3223,6 +3226,9 @@ TEST (test_tensor_filter, reload_tflite_same_model_not_found_n) gchar *test_model; gchar *test_model_renamed; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -3246,9 +3252,7 @@ TEST (test_tensor_filter, reload_tflite_same_model_not_found_n) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); - - /* open tf-lite model */ + /* open tf-lite model */ EXPECT_TRUE (fw->open (prop, &private_data) == 0); /* reload tf-lite model again */ @@ -3286,6 +3290,9 @@ TEST (test_tensor_filter, reload_tflite_same_model_wrong_dims_n) gchar *test_model_backup; gchar *test_model_renamed; + /* Check if mandatory methods are contained */ + ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); + /* supposed to run test in build directory */ if (root_path == NULL) root_path = ".."; @@ -3311,8 +3318,6 @@ TEST (test_tensor_filter, reload_tflite_same_model_wrong_dims_n) prop->model_files = model_files; prop->num_models = 1; - ASSERT_TRUE (fw && fw->open && fw->close && fw->reloadModel); - /* open tf-lite model */ EXPECT_TRUE (fw->open (prop, &private_data) == 0); -- 2.7.4