Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash at start up with conf-dir=/path,*

Browse Source 
Thanks to Brian Carpenter and American Fuzzy Lop for finding the bug.
This commit is contained in:
Simon Kelley
2015-11-21 21:47:41 +00:00
parent 67ab3285b5
commit 0007ee9064
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/option.c
View File

@@ -1514,12 +1514,18 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
{ {
li = opt_malloc(sizeof(struct list)); li = opt_malloc(sizeof(struct list));
if (*arg == '*') if (*arg == '*')
{
/* "*" with no suffix is a no-op */
if (arg[1] == 0)
free(li);
else
{ {
li->next = match_suffix; li->next = match_suffix;
match_suffix = li; match_suffix = li;
/* Have to copy: buffer is overwritten */ /* Have to copy: buffer is overwritten */
li->suffix = opt_string_alloc(arg+1); li->suffix = opt_string_alloc(arg+1);
} }
}
else else
{ {
li->next = ignore_suffix; li->next = ignore_suffix;