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

Allow control characters in names in the cache, handle when logging.

Browse Source
This commit is contained in:
Simon Kelley
2015-03-29 22:17:14 +01:00
parent 1e153945de
commit 394ff492da
3 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rfc1035.c
View File

@@ -16,7 +16,6 @@
#include "dnsmasq.h"
/* isExtract == 2 -> DNSSEC mode, no bitstrings, no ascii checks. */
int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
char *name, int isExtract, int extrabytes)
{
@@ -87,7 +86,7 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
if ((l & 0x3f) != 1)
return 0; /* we only understand bitstrings */
if (isExtract != 1)
if (!isExtract)
return 0; /* Cannot compare bitsrings */
count = *p++;
@@ -129,8 +128,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
if (isExtract)
{
unsigned char c = *p;
if ((isExtract == 2 || (isascii(c) && !iscntrl(c))) && c != '.')
*cp++ = *p;
if (c != 0 && c != '.')
*cp++ = c;
else
return 0;
}