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

Fix codeql errors #34248

Merged
merged 4 commits into from
Jul 12, 2024
Merged

Fix codeql errors #34248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f467855
Fix error with not checking results of snprintf
jlatusek Jul 5, 2024
57378a9
Fix codeql errors
jlatusek Jul 8, 2024
a80bf72
Merge remote-tracking branch 'upstream/master' into codeql
jlatusek Jul 9, 2024
9a4ae79
Merge branch 'master' into codeql
jlatusek Jul 10, 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
23 changes: 16 additions & 7 deletions examples/common/tracing/decoder/logging/ToCertificateString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const char * ToCertificate(const chip::ByteSpan & source, chip::MutableCharSpan
{
// Reset the buffer
memset(destination.data(), '\0', destination.size());

int snprintf_len = 0;
if (source.size() == 0)
{
return destination.data();
Expand Down Expand Up @@ -70,7 +70,8 @@ const char * ToCertificate(const chip::ByteSpan & source, chip::MutableCharSpan
ChipLogError(DataManagement, "Certificate size is greater than 400 bytes");
}

snprintf(destination.data(), destination.size(), "%s", str.Get());
snprintf_len = snprintf(destination.data(), destination.size(), "%s", str.Get());
VerifyOrExit(snprintf_len >= 0, ChipLogError(DataManagement, "Failed to write certificate"););
}
else
{
Expand All @@ -83,15 +84,23 @@ const char * ToCertificate(const chip::ByteSpan & source, chip::MutableCharSpan
size_t inIndex = 0;
size_t outIndex = strlen(header) + 1;

snprintf(destination.data(), destination.size(), "%s\n", header);
snprintf_len = snprintf(destination.data(), destination.size(), "%s\n", header);
VerifyOrExit(snprintf_len >= 0, ChipLogError(DataManagement, "Failed to write header"););
for (; inIndex < base64DataLen; inIndex += 64)
{
auto charsPrinted = snprintf(&destination.data()[outIndex], destination.size() - outIndex, "%.64s\n", &str[inIndex]);
outIndex += static_cast<size_t>(charsPrinted);
snprintf_len = snprintf(&destination.data()[outIndex], destination.size() - outIndex, "%.64s\n", &str[inIndex]);
VerifyOrExit(snprintf_len >= 0, ChipLogError(DataManagement, "Failed to write certificate"););

outIndex += static_cast<size_t>(snprintf_len);
}
snprintf(&destination.data()[outIndex], destination.size() - outIndex, "%s", footer);
snprintf_len = snprintf(&destination.data()[outIndex], destination.size() - outIndex, "%s", footer);
VerifyOrExit(snprintf_len >= 0, ChipLogError(DataManagement, "Failed to write footer"););
}
exit:
if (snprintf_len < 0)
{
memset(destination.data(), '\0', destination.size());
}

return destination.data();
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/WriteClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class WriteClient : public Messaging::ExchangeDelegate
ReturnErrorOnFailure(EncodeSingleAttributeDataIB(path, DataModel::List<uint8_t>()));

path.mListOp = ConcreteDataAttributePath::ListOperation::AppendItem;
for (ListIndex i = 0; i < value.size(); i++)
for (size_t i = 0; i < value.size(); i++)
{
ReturnErrorOnFailure(EncodeSingleAttributeDataIB(path, value.data()[i]));
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/tests/TestBufferedReadCallback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ void DataSeriesValidator::OnAttributeData(const ConcreteDataAttributePath & aPat

auto iter = value.begin();

uint8_t index = 0;
uint32_t index = 0;
while (iter.Next() && index < expectedListLength)
{
auto & iterValue = iter.GetValue();
EXPECT_EQ(iterValue, (index));
EXPECT_EQ(iterValue, (index % 256));
index++;
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/shell/commands/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static CHIP_ERROR ConfigSetSetupDiscriminator(char * argv)
}
else
{
streamer_printf(sout, "Setup discriminator setting failed with code: %d\r\n", error);
streamer_printf(sout, "Setup discriminator setting failed with code: %d\r\n", error.AsInteger());
}

return error;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/shell/commands/Dns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,18 @@ class DnsShellResolverDelegate : public Dnssd::DiscoverNodeDelegate, public Addr
auto retryInterval = nodeData.GetMrpRetryIntervalIdle();

if (retryInterval.has_value())
streamer_printf(streamer_get(), " MRP retry interval (idle): %" PRIu32 "ms\r\n", *retryInterval);
streamer_printf(streamer_get(), " MRP retry interval (idle): %" PRIu32 "ms\r\n", retryInterval->count());

retryInterval = nodeData.GetMrpRetryIntervalActive();

if (retryInterval.has_value())
streamer_printf(streamer_get(), " MRP retry interval (active): %" PRIu32 "ms\r\n", *retryInterval);
streamer_printf(streamer_get(), " MRP retry interval (active): %" PRIu32 "ms\r\n", retryInterval->count());

auto activeThreshold = nodeData.GetMrpRetryActiveThreshold();

if (activeThreshold.has_value())
{
streamer_printf(streamer_get(), " MRP retry active threshold time: %" PRIu32 "ms\r\n", *activeThreshold);
streamer_printf(streamer_get(), " MRP retry active threshold time: %" PRIu32 "ms\r\n", activeThreshold->count());
}

streamer_printf(streamer_get(), " Supports TCP Client: %s\r\n", nodeData.supportsTcpClient ? "yes" : "no");
Expand Down
Loading