From: cheoleun moon Date: Thu, 3 Nov 2022 09:54:28 +0000 (+0900) Subject: Check return value X-Git-Tag: accepted/tizen/unified/20221107.173032~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=480a4442f162c75fb68eec2c943d9a49fcba28f1;p=platform%2Fcore%2Fapi%2Fvine.git Check return value Change-Id: I7ea3309b66925d2d0ac0b341eaa55c341781dff8 --- diff --git a/plugins/libwebsockets/libwebsockets-plugin.cpp b/plugins/libwebsockets/libwebsockets-plugin.cpp index 7dfdcf9..383c8cd 100755 --- a/plugins/libwebsockets/libwebsockets-plugin.cpp +++ b/plugins/libwebsockets/libwebsockets-plugin.cpp @@ -671,11 +671,12 @@ static int _websocket_protocol_cb(struct lws *wsi, if (!ws || len == 0) return 0; - size_t total_len = _save_data(ws, in, len, + int total_len = _save_data(ws, in, len, lws_is_first_fragment(wsi), lws_is_final_fragment(wsi)); + RET_VAL_IF(total_len < 0, -1, "_save_data() failed"); if (lws_is_final_fragment(wsi) && g_callbacks.received_cb) - g_callbacks.received_cb(total_len, ws->user); + g_callbacks.received_cb((size_t)total_len, ws->user); break; } @@ -754,12 +755,13 @@ static int _websocket_protocol_cb(struct lws *wsi, if (!ws || len == 0) return 0; - size_t total_len = _save_data(ws, in, len, + int total_len = _save_data(ws, in, len, lws_is_first_fragment(wsi), lws_is_final_fragment(wsi)); + RET_VAL_IF(total_len < 0, -1, "_save_data() failed"); if (lws_is_final_fragment(wsi) && !ws->destroy_requested && g_callbacks.received_cb) - g_callbacks.received_cb(total_len, ws->user); + g_callbacks.received_cb((size_t)total_len, ws->user); break; } diff --git a/src/vine-data-path-state.cpp b/src/vine-data-path-state.cpp index 21907c1..eaf5c91 100644 --- a/src/vine-data-path-state.cpp +++ b/src/vine-data-path-state.cpp @@ -266,7 +266,8 @@ void VineConnectedState::handle_failure(std::string msg) void VineConnectedState::read_data(size_t bytes) { unsigned char *buf = (unsigned char *)malloc(bytes); - size_t read_size = __fn.read(__plugin, buf, bytes); + int read_size = __fn.read(__plugin, buf, bytes); + RET_IF(read_size < 0, "read() failed. errno[%d]", errno); if (bytes != read_size) { // TODO: Check it handle_failure("Wrong size"); @@ -444,7 +445,8 @@ void VineAuthRequestedState::handle_failure(std::string msg) void VineAuthRequestedState::read_data(size_t bytes) { unsigned char *buf = (unsigned char *)malloc(bytes); - size_t read_size = __fn.read(__plugin, buf, bytes); + int read_size = __fn.read(__plugin, buf, bytes); + RET_IF(read_size < 0, "read() failed. errno[%d]", errno); if (bytes != read_size) { // TODO: Check it @@ -599,7 +601,8 @@ void VineAuthRespondedState::handle_failure(std::string msg) void VineAuthRespondedState::read_data(size_t bytes) { unsigned char *buf = (unsigned char *)malloc(bytes); - size_t read_size = __fn.read(__plugin, buf, bytes); + int read_size = __fn.read(__plugin, buf, bytes); + RET_IF(read_size < 0, "read() failed. errno[%d]", errno); if (bytes != read_size) { // TODO: Check it @@ -714,8 +717,9 @@ void VineEstablishedState::exit() int VineEstablishedState::read(unsigned char *buf, size_t buf_len, size_t *read_len) { - size_t bytes = __fn.read(__plugin, buf, buf_len); - *read_len = bytes; + ssize_t bytes = __fn.read(__plugin, buf, buf_len); + RET_VAL_IF(bytes < 0, VINE_ERROR_OPERATION_FAILED, "read() failed. errno[%d]", errno); + *read_len = (size_t)bytes; return VINE_ERROR_NONE; }