Skip to content

Commit

Permalink
Minor changes to memset() call
Browse files Browse the repository at this point in the history
Call calloc() instead of malloc()/memset().
  • Loading branch information
DimitriPapadopoulos committed Sep 6, 2023
1 parent 063adb8 commit 4567d8a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions src/ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,14 @@ static inline void route_destroy(struct rtentry *route)
static int ipv4_get_route(struct rtentry *route)
{
size_t buffer_size = IPV4_GET_ROUTE_BUFFER_CHUNK_SIZE;
char *buffer = malloc(buffer_size);
char *buffer;
char *realloc_buffer;
int err = 0;
char *start, *line;
char *saveptr1 = NULL, *saveptr2 = NULL;
uint32_t rtdest, rtmask, rtgtw;
int rtfound = 0;

if (!buffer) {
err = ERR_IPV4_SEE_ERRNO;
goto end;
}

/*
* initialize the buffer with zeroes, aiming to address the
* coverity issue "TAINTED_SCALAR passed to a tainted sink"
Expand All @@ -148,7 +143,12 @@ static int ipv4_get_route(struct rtentry *route)
* that there is a delimiting '\0' character by proper
* initialization. We ensure this also when growing the buffer.
*/
memset(buffer, '\0', IPV4_GET_ROUTE_BUFFER_CHUNK_SIZE);
buffer = calloc(1, buffer_size);
if (!buffer) {
err = ERR_IPV4_SEE_ERRNO;
goto end;
}

log_debug("ip route show %s\n", ipv4_show_route(route));

// store what we are looking for
Expand Down
4 changes: 2 additions & 2 deletions src/tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ static int tcp_connect(struct tunnel *tunnel)
log_debug("server_addr: %s\n", inet_ntoa(server.sin_addr));
log_debug("server_port: %u\n", ntohs(server.sin_port));
server.sin_family = AF_INET;
memset(&(server.sin_zero), '\0', 8);
memset(&(server.sin_zero), 0, sizeof(server.sin_zero));
log_debug("gateway_ip: %s\n", inet_ntoa(tunnel->config->gateway_ip));
log_debug("gateway_port: %u\n", tunnel->config->gateway_port);

Expand Down Expand Up @@ -840,7 +840,7 @@ static int tcp_connect(struct tunnel *tunnel)
// be careful not to fetch too many bytes at once
const char *response = NULL;

memset(&(request), '\0', sizeof(request));
memset(&(request), 0, sizeof(request));
for (int j = 0; response == NULL; j++) {
if (j >= ARRAY_SIZE(request) - 1) {
log_error("Proxy response is unexpectedly large and cannot fit in the %lu-bytes buffer.\n",
Expand Down

0 comments on commit 4567d8a

Please sign in to comment.