Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix misuse of const pointer in src/nftset.c.

Browse Source 
Thanks to  Kevin Darbyshire-Bryant for the initial patch, which was
modified by srk - any remaining bugs are his.
This commit is contained in:
Simon Kelley
2023-11-22 15:20:53 +00:00
parent d16b995756
commit b8b5b734b4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nftset.c
View File

@@ -43,7 +43,8 @@ int add_to_nftset(const char *setname, const union all_addr *ipaddr, int flags,
const char *cmd = remove ? cmd_del : cmd_add; const char *cmd = remove ? cmd_del : cmd_add;
int ret, af = (flags & F_IPV4) ? AF_INET : AF_INET6; int ret, af = (flags & F_IPV4) ? AF_INET : AF_INET6;
size_t new_sz; size_t new_sz;
char *new, *err, *nl; char *err_str, *new, *nl;
const char *err;
static char *cmd_buf = NULL; static char *cmd_buf = NULL;
static size_t cmd_buf_sz = 0; static size_t cmd_buf_sz = 0;
@@ -78,14 +79,19 @@ int add_to_nftset(const char *setname, const union all_addr *ipaddr, int flags,
} }
ret = nft_run_cmd_from_buffer(ctx, cmd_buf); ret = nft_run_cmd_from_buffer(ctx, cmd_buf);
err = (char *)nft_ctx_get_error_buffer(ctx); err = nft_ctx_get_error_buffer(ctx);
if (ret != 0) if (ret != 0)
{ {
/* Log only first line of error return. */ /* Log only first line of error return. */
if ((nl = strchr(err, '\n'))) if ((err_str = whine_malloc(strlen(err) + 1)))
*nl = 0; {
my_syslog(LOG_ERR, "nftset %s %s", setname, err); strcpy(err_str, err);
if ((nl = strchr(err_str, '\n')))
*nl = 0;
my_syslog(LOG_ERR, "nftset %s %s", setname, err_str);
free(err_str);
}
} }
return ret; return ret;