From e762f054540d077178f3bd4cd5eae317d22a0627 Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Mon, 26 Apr 2021 12:18:21 +0900 Subject: [PATCH] Fix coverity issues Change-Id: Ib5a0ca09a03d7dff840ead3e437c8668bd128ab4 Signed-off-by: Cheoleun Moon --- src/vine-data-path.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vine-data-path.cpp b/src/vine-data-path.cpp index 6971529..66fe598 100755 --- a/src/vine-data-path.cpp +++ b/src/vine-data-path.cpp @@ -363,12 +363,14 @@ static void __written_cb(int bytes, void *user_data) static void __invoke_terminated_user_cb(void *event, void *user_data) { + RET_IF(user_data == NULL, "dp is NULL"); + vine_data_path_s *dp = (vine_data_path_s *)user_data; VINE_LOGD("user callback is invoked by event queue."); start_default_state(dp, dp->plugin_handle, dp->state); - if (dp && dp->terminated_cb) + if (dp->terminated_cb) dp->terminated_cb(dp, dp->terminated_cb_data); } @@ -692,6 +694,7 @@ int vine_data_path_connect(vine_address_family_e addr_family, vine_data_path_s *dp = _vine_data_path_create(VINE_DATA_PATH_TYPE_CLIENT, security, ip, port, NULL, event_fd); RET_VAL_IF(dp == NULL, VINE_ERROR_OUT_OF_MEMORY, "Out of memory"); + RET_VAL_IF(connected_datapath == NULL, VINE_ERROR_INVALID_PARAMETER, "connected_datapath is NULL"); if (dp->addr) free(dp->addr); @@ -723,8 +726,7 @@ int vine_data_path_connect(vine_address_family_e addr_family, _vine_data_path_destroy(*connected_datapath); } - if (connected_datapath) - *connected_datapath = dp; + *connected_datapath = dp; return __convert_data_path_error_to_vine_error((vine_data_path_error)ret); } -- 2.7.4