未验证 提交 1cfed362 编写于 作者: Y Yang Zhao 提交者: GitHub

fix: fix some coverity issue for 2.6 (#13427)

上级 502f5b86
...@@ -1175,6 +1175,7 @@ int wsclient_handshake() { ...@@ -1175,6 +1175,7 @@ int wsclient_handshake() {
unsigned char key_nonce[16]; unsigned char key_nonce[16];
char websocket_key[256]; char websocket_key[256];
memset(request_header, 0, 1024); memset(request_header, 0, 1024);
memset(recv_buf, 0, 1024);
srand(time(NULL)); srand(time(NULL));
int i; int i;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
...@@ -1317,11 +1318,17 @@ int wsclient_conn() { ...@@ -1317,11 +1318,17 @@ int wsclient_conn() {
} }
char recv_buffer[1024]; char recv_buffer[1024];
memset(recv_buffer, 0, 1024); memset(recv_buffer, 0, 1024);
recv(args.socket, recv_buffer, 1023, 0); int bytes = recv(args.socket, recv_buffer, 1023, 0);
if (bytes <= 0) {
fprintf(stderr, "failed to receive from socket\n");
return -1;
}
char *received_json = strstr(recv_buffer, "{"); char *received_json = strstr(recv_buffer, "{");
cJSON *root = cJSON_Parse(received_json); cJSON *root = cJSON_Parse(received_json);
if (root == NULL) { if (root == NULL) {
fprintf(stderr, "fail to parse response into json: %s\n", recv_buffer); fprintf(stderr, "fail to parse response into json: %s\n", recv_buffer);
return -1;
} }
cJSON *code = cJSON_GetObjectItem(root, "code"); cJSON *code = cJSON_GetObjectItem(root, "code");
...@@ -1356,6 +1363,7 @@ cJSON *wsclient_parse_response() { ...@@ -1356,6 +1363,7 @@ cJSON *wsclient_parse_response() {
do { do {
bytes = recv(args.socket, recv_buffer + received, recv_length - received, 0); bytes = recv(args.socket, recv_buffer + received, recv_length - received, 0);
if (bytes == -1) { if (bytes == -1) {
free(recv_buffer);
fprintf(stderr, "websocket recv failed with bytes: %d\n", bytes); fprintf(stderr, "websocket recv failed with bytes: %d\n", bytes);
return NULL; return NULL;
} }
...@@ -1477,6 +1485,7 @@ int wsclient_print_data(int rows, TAOS_FIELD *fields, int cols, int64_t id, int ...@@ -1477,6 +1485,7 @@ int wsclient_print_data(int rows, TAOS_FIELD *fields, int cols, int64_t id, int
} }
for (int i = 0; i < rows; i++) { for (int i = 0; i < rows; i++) {
if (*pshowed_rows == DEFAULT_RES_SHOW_NUM) { if (*pshowed_rows == DEFAULT_RES_SHOW_NUM) {
free(recv_buffer);
return 0; return 0;
} }
for (int c = 0; c < cols; c++) { for (int c = 0; c < cols; c++) {
...@@ -1499,6 +1508,7 @@ int wsclient_print_data(int rows, TAOS_FIELD *fields, int cols, int64_t id, int ...@@ -1499,6 +1508,7 @@ int wsclient_print_data(int rows, TAOS_FIELD *fields, int cols, int64_t id, int
putchar('\n'); putchar('\n');
*pshowed_rows += 1; *pshowed_rows += 1;
} }
free(recv_buffer);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册