Skip to content

mDNS: protect MDNSResponder::queryService against misuse #7216

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

Merged
merged 2 commits into from
Apr 15, 2020
Merged

mDNS: protect MDNSResponder::queryService against misuse #7216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d78f27c
mDNS: protect MDNSResponder::queryService against misuse
d-a-v Apr 15, 2020
2782f3d
fix style
d-a-v Apr 15, 2020
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
6 changes: 6 additions & 0 deletions libraries/ESP8266mDNS/src/LEAmDNS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,12 @@ uint32_t MDNSResponder::queryService(const char* p_pcService,
const char* p_pcProtocol,
const uint16_t p_u16Timeout /*= MDNS_QUERYSERVICES_WAIT_TIME*/)
{
if (0 == m_pUDPContext)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this a ptr? check against nullptr?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. For coherency I sticked to this file's style.

Arduino/libraries/ESP8266mDNS/src/LEAmDNS.cpp

Line 101 in e1789dd

if (0 == m_pUDPContext)

I was afraid to modify too much for when LEAmDNS2 is coming to avoid merge complication.

{
// safeguard against misuse
return 0;
}

DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] queryService '%s.%s'\n"), p_pcService, p_pcProtocol););

uint32_t u32Result = 0;
Expand Down