Enforce valid spec-conformant string encoding in TLV #30393
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pullapprove
bot
requested review from
andyg-apple,
anush-apple,
arkq,
bzbarsky-apple,
carol-apple,
cecille,
chrisdecenzo,
chshu,
chulspro,
cliffamzn,
Damian-Nordic,
dhrishi,
harsha-rajendran,
hawk248,
hicklin,
jepenven-silabs,
jmartinez-silabs,
jmeg-sfy,
joonhaengHeo and
jtung-apple
|
PR #30393: Size comparison from b0f5983 to e0672dc Increases (3 builds for cc32xx, mbed)
Full report (3 builds for cc32xx, mbed)
|
tcarmelveilleux
approved these changes
Nov 9, 2023
|
PR #30393: Size comparison from b0f5983 to 20101ae Increases (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Decreases (2 builds for linux)
Full report (73 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
cecille
approved these changes
Nov 9, 2023
src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
Show resolved
Hide resolved
|
PR #30393: Size comparison from 08bcb56 to 207c7a7 Increases (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Decreases (3 builds for bl702l, linux)
Full report (73 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
lpbeliveau-silabs
approved these changes
Nov 10, 2023
| @@ -27,8 +27,9 @@ using namespace chip::app::Clusters::TemperatureControl; | |||
| using chip::Protocols::InteractionModel::Status; | |||
|
|
|||
| // TODO: Configure your options for each endpoint | |||
| CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { CharSpan("Hot", 3), CharSpan("Warm", 4), | |||
| CharSpan("Cold", 4) }; | |||
| CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { CharSpan::fromCharString("Hot"), | |||
There was a problem hiding this comment.
Please use "Hot"_span next time @andreilitvin
| @@ -209,6 +209,7 @@ struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneB | |||
|
|
|||
| CHIP_ERROR Serialize(TLV::TLVWriter & writer) const override | |||
| { | |||
| // TODO: if we have mNameLength, should this bin ByteSpan instead? | |||
There was a problem hiding this comment.
I don't understand this comment.
| @@ -551,7 +551,7 @@ void TimeSynchronizationServer::InitTimeZone() | |||
| for (auto & tzStore : mTimeZoneObj.timeZoneList) | |||
| { | |||
| memset(tzStore.name, 0, sizeof(tzStore.name)); | |||
| tzStore.timeZone = { .offset = 0, .validAt = 0, .name = MakeOptional(CharSpan(tzStore.name, sizeof(tzStore.name))) }; | |||
| tzStore.timeZone = { .offset = 0, .validAt = 0, .name = MakeOptional(CharSpan(tzStore.name, 0)) }; | |||
There was a problem hiding this comment.
This looks wrong to me. The right thing to set .name to here is NullOptional, not empty string.
| * Invalid UTF8 string (contains some characters that are invalid) | ||
| * | ||
| */ | ||
| #define CHIP_ERROR_INVALID_UTF8 CHIP_CORE_ERROR(0x12) |
There was a problem hiding this comment.
Please align the indentation with the other errors.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
CharSpan::fromCharStringinstead ofCharSpan("foo")because the latter is off-by-one-1for sizes in a few unit tests because they also used sizeof instead of strlenEnabled check on write, but not on read (since I imagine controllers have to be lenient).
However chip-tool enables this on read too, so that certification/validation catches invalid devices.