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

Cleanup darwin usage of strtok and strncpy in DNS implementation #11934

Merged
merged 10 commits into from
Nov 18, 2021
Merged

Cleanup darwin usage of strtok and strncpy in DNS implementation #11934

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dfa6c2b
Update DnssdImpl for darwin
andy31415 Nov 17, 2021
3f093bb
Replace one more instance of strncpy with copystring
andy31415 Nov 17, 2021
bcf3809
Restyle fixes
andy31415 Nov 17, 2021
fd2c84d
Use platform namespace prefix for CopyString
andy31415 Nov 17, 2021
e89d667
Use a memcpy for sometthing that is not a string
andy31415 Nov 17, 2021
79fbcbf
add a limit to valuelen on txt records
andy31415 Nov 17, 2021
50a9c88
Validate value lenght - 0 size value should not copy anything
andy31415 Nov 17, 2021
0c73035
Restyle fixes
andy31415 Nov 17, 2021
5cfbe88
Merge branch 'master' into cleanup_darwin_strtok
andy31415 Nov 17, 2021
911fb50
Fix off by one memcpy
andy31415 Nov 18, 2021
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
26 changes: 17 additions & 9 deletions src/platform/Darwin/DnssdImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,19 +312,22 @@ void OnBrowseAdd(BrowseContext * context, const char * name, const char * type,

VerifyOrReturn(strcmp(kLocalDot, domain) == 0);

char * tokens = strdup(type);
char * regtype = strtok(tokens, ".");
free(tokens);

DnssdService service = {};
service.mInterface = interfaceId;
service.mProtocol = context->protocol;

strncpy(service.mName, name, sizeof(service.mName));
service.mName[Common::kInstanceNameMaxLength] = 0;
Platform::CopyString(service.mName, name);
Platform::CopyString(service.mType, type);

strncpy(service.mType, regtype, sizeof(service.mType));
service.mType[kDnssdTypeMaxSize] = 0;
// only the first token after '.' should be included in the type
for (char * p = service.mType; *p != '\0'; p++)
{
if (*p == '.')
{
*p = '\0';
break;
}
}

context->services.push_back(service);
}
Expand Down Expand Up @@ -426,7 +429,12 @@ static CHIP_ERROR GetAddrInfo(void * context, DnssdResolveCallback callback, uin
err = TXTRecordGetItemAtIndex(txtLen, txtRecord, i, kDnssdKeyMaxSize, key, &valueLen, &valuePtr);
VerifyOrReturnError(CheckForSuccess(sdCtx, __func__, err, true), CHIP_ERROR_INTERNAL);

strncpy(value, reinterpret_cast<const char *>(valuePtr), valueLen);
if (valueLen >= sizeof(value))
{
// Truncation, but nothing better we can do
valueLen = sizeof(value) - 1;
}
memcpy(value, valuePtr, valueLen);
value[valueLen] = 0;

sdCtx->textEntries.push_back(TextEntry{ strdup(key), reinterpret_cast<const uint8_t *>(strdup(value)), valueLen });
Expand Down