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

DNSSEC fix for non-ascii characters in labels.

Browse Source
This commit is contained in:
Simon Kelley
2015-03-28 21:34:07 +00:00
parent 0b8a5a30a7
commit 1e153945de
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rfc1035.c
View File

@@ -16,6 +16,7 @@
#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)
{
@@ -86,7 +87,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)
if (isExtract != 1)
return 0; /* Cannot compare bitsrings */
count = *p++;
@@ -128,7 +129,7 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
if (isExtract)
{
unsigned char c = *p;
if (isascii(c) && !iscntrl(c) && c != '.')
if ((isExtract == 2 || (isascii(c) && !iscntrl(c))) && c != '.')
*cp++ = *p;
else
return 0;