master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix small issues reported by cppcheck (#967)

Browse Source 
- Redundant checks for variable values
- Potential nullptr dereference
- Double check for the same variable

Run with:
```
cppcheck --inline-suppr --language=c --enable=warning,performance --force .
```

Co-authored-by: Pavel Punsky <pavel.punsky@epicgames.com>
This commit is contained in:
Pavel Punsky 2022-09-08 02:25:38 -07:00 committed by GitHub
parent e2ff7caf9d
commit 98d19fc441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/common/hiredis_libevent2.c
View File

@ -241,6 +241,10 @@ redis_context_handle redisLibeventAttach(struct event_base *base, char *ip0, int
ac = redisAsyncConnect(ip, port);
if (!ac) {
fprintf(stderr,"Error: redisAsyncConnect returned NULL\n");
return NULL;
}
else if (ac->err) {
fprintf(stderr,"Error: %s:%s\n", ac->errstr, ac->c.errstr);
return NULL;
}

5
src/apps/relay/mainrelay.c
View File

@ -2457,7 +2457,7 @@ int main(int argc, char **argv)
}
}
if(use_cli && cli_password[0]==0 && use_cli) {
if(use_cli && cli_password[0]==0) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "\nCONFIG ERROR: Empty cli-password, and so telnet cli interface is disabled! Please set a non empty cli-password!\n");
use_cli = 0;
}
@ -2759,8 +2759,7 @@ static void adjust_key_file_name(char *fn, const char* file_title, int critical)
strncpy(fn,full_path_to_file,sizeof(turn_params.cert_file)-1);
fn[sizeof(turn_params.cert_file)-1]=0;
if(full_path_to_file)
free(full_path_to_file);
free(full_path_to_file);
return;
}

16
src/apps/relay/tls_listener.c
View File

@ -66,6 +66,11 @@ static void server_input_handler(struct evconnlistener *l, evutil_socket_t fd,
tls_listener_relay_server_type * server = (tls_listener_relay_server_type*) arg;
if (!server)
{
return;
}
if(!(server->connect_cb)) {
socket_closesocket(fd);
return;
@ -73,9 +78,6 @@ static void server_input_handler(struct evconnlistener *l, evutil_socket_t fd,
FUNCSTART;
if (!server)
return;
bcopy(sa,&(server->sm.m.sm.nd.src_addr),socklen);
addr_debug_print(server->verbose, &(server->sm.m.sm.nd.src_addr),"tcp or tls connected to");
@ -133,6 +135,11 @@ static void sctp_server_input_handler(struct evconnlistener *l, evutil_socket_t
tls_listener_relay_server_type * server = (tls_listener_relay_server_type*) arg;
if (!server)
{
return;
}
if(!(server->connect_cb)) {
socket_closesocket(fd);
return;
@ -140,9 +147,6 @@ static void sctp_server_input_handler(struct evconnlistener *l, evutil_socket_t
FUNCSTART;
if (!server)
return;
bcopy(sa,&(server->sm.m.sm.nd.src_addr),socklen);
addr_debug_print(server->verbose, &(server->sm.m.sm.nd.src_addr),"sctp or tls/sctp connected to");

2
src/client/ns_turn_msg.c
View File

@ -837,7 +837,7 @@ int stun_is_channel_message_str(const uint8_t *buf, size_t *blen, uint16_t* chnu
if(mandatory_padding) {
return 0;
} else if ((datalen_actual < datalen_header) || (datalen_header == 0)) {
} else if (datalen_header == 0) {
return 0;
} else {
uint16_t diff = datalen_actual - datalen_header;