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

Further work from a0a3b8ad3e

Browse Source 
When query longer than longest domain, crop directly to length
of longest domain.
This commit is contained in:
Simon Kelley
2021-06-21 00:01:51 +01:00
parent a60a233329
commit cbd76447fd
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/domain-match.c
View File

@@ -127,7 +127,12 @@ int lookup_domain(char *qdomain, int flags, int *lowout, int *highout)
if (rc < 0) if (rc < 0)
{ {
if (high == try) if (high == try)
break; {
/* qdomain is longer or same length as longest domain, and try == 0
crop the query to the longest domain. */
crop_query = qlen - daemon->serverarray[try]->domain_len;
break;
}
high = try; high = try;
} }
else else
@@ -151,9 +156,7 @@ int lookup_domain(char *qdomain, int flags, int *lowout, int *highout)
{ {
if (old != (len = daemon->serverarray[try]->domain_len)) if (old != (len = daemon->serverarray[try]->domain_len))
{ {
/* crop_query must be at least one always. */ crop_query = qlen - len;
if (qlen != len)
crop_query = qlen - len;
break; break;
} }
} }
@@ -179,6 +182,10 @@ int lookup_domain(char *qdomain, int flags, int *lowout, int *highout)
} }
} }
/* crop_query must be at least one always. */
if (crop_query == 0)
crop_query = 1;
qlen -= crop_query; qlen -= crop_query;
if (leading_dot) if (leading_dot)
{ {