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

Jump to bottom

Enforce valid spec-conformant string encoding in TLV #30393

Merged
merged 16 commits into from
Nov 10, 2023
Merged

Enforce valid spec-conformant string encoding in TLV #30393

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a05641
Add some validation configs and at least read-time implementation for…
andy31415 Nov 9, 2023
abdf8db
Add TLVWriter implementation too
andy31415 Nov 9, 2023
fe9104e
Add includes and implementation
andy31415 Nov 9, 2023
ab7447d
make sure timezone is properly initialized to not send 64 bytes over …
andy31415 Nov 9, 2023
cc341f7
make chip-tool always be strict
andy31415 Nov 9, 2023
c365f5b
Fix some unit tests, scenes still broken
andy31415 Nov 9, 2023
5ab9f20
More unit test updates. Scenes pass now
andy31415 Nov 9, 2023
08cdf5f
Use fromCharString more
andy31415 Nov 9, 2023
e0672dc
Fix more unit tests
andy31415 Nov 9, 2023
a7f6fdb
Undo a setter that was not useful
andy31415 Nov 9, 2023
4d625bb
Remove redundant operator ==
andy31415 Nov 9, 2023
8202ba5
More unit test cleanup and fixes
andy31415 Nov 9, 2023
05e7767
Restyle
andy31415 Nov 9, 2023
6993d19
mNameLength for scenes seems not a lie after all ... make code better
andy31415 Nov 9, 2023
20101ae
Use v on read for size instead of len
andy31415 Nov 9, 2023
207c7a7
Merge branch 'master' into utf8_enforce
andreilitvin Nov 10, 2023
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
11 changes: 9 additions & 2 deletions src/app/clusters/scenes-server/SceneTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,14 @@ class SceneTable
}
~SceneData(){};

bool operator==(const SceneData &other) const {
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
return (
(CharSpan(mName, mNameLength) == CharSpan(other.mName, other.mNameLength)) &&
(mSceneTransitionTimeMs == other.mSceneTransitionTimeMs) &&
(mExtensionFieldSets == other.mExtensionFieldSets)
);
}

void SetName(const CharSpan & sceneName)
{
if (nullptr == sceneName.data())
Expand All @@ -203,8 +211,7 @@ class SceneTable

void Clear()
{
SetName(CharSpan());

memset(mName, 0, sizeof(mName));
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
mSceneTransitionTimeMs = 0;
mExtensionFieldSets.Clear();
}
Expand Down
3 changes: 2 additions & 1 deletion src/app/clusters/scenes-server/SceneTableImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneB

CHIP_ERROR Serialize(TLV::TLVWriter & writer) const override
{
CharSpan nameSpan(mStorageData.mName, mStorageData.mNameLength);
// TODO: if we have mNameLength, should this bin ByteSpan instead?
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand this comment.

CharSpan nameSpan(mStorageData.mName, strnlen(mStorageData.mName, mStorageData.mNameLength));
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
TLV::TLVType container;
ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, container));

Expand Down
2 changes: 1 addition & 1 deletion src/lib/support/tests/TestTlvJson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext)
"}\n");

const char charBuf[] = "hello";
CharSpan charSpan(charBuf);
CharSpan charSpan = CharSpan::fromCharString(charBuf);
EncodeAndValidate(charSpan,
"{\n"
" \"value\" : \"hello\"\n"
Expand Down
Loading