Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for v1.1.12 #70

Open
wants to merge 2 commits into
base: origin-v1.1.12-1733756632
Choose a base branch
from
+1,171 −1
Open

Patch for v1.1.12 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c331de7
commit patch 20612408
Dec 9, 2024
6802eca
commit patch 20506860
Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/dns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,16 @@ DNSResult DNS::GetResult()
/* Identical handling to PTR */

case DNS_QUERY_PTR:
{
/* Reverse lookups just come back as char* */
resultstr = std::string((const char*)data.first);
if (resultstr.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-") != std::string::npos)
{
std::string ro = req->orig;
delete req;
return DNSResult(this_id | ERROR_MASK, "Invalid char(s) in reply", 0, ro);
}
}
break;

default:
Expand Down Expand Up @@ -849,7 +857,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
else i += header.payload[i] + 1; /* skip length and label */
}
}
if (length - i < 10)
if (static_cast<int>(length - i) < 10)
return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply");

/* XXX: We actually initialise 'rr' here including its ttl field */
Expand Down
Loading