Skip to content

Commit c3d97ca

Browse files
committed
Strings are fixed
1 parent 6edc3dc commit c3d97ca

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

examples/all-clusters-app/all-clusters-common/src/MeterIdentificationEventTriggers.cpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class OldMeterIdentificationAttributes
5050
if (!value.IsNull())
5151
{
5252
const size_t len = value.Value().size();
53-
if (auto * str = static_cast<char *>(chip::Platform::MemoryAlloc(1 + len)))
53+
if (auto * str = static_cast<char *>(chip::Platform::MemoryAlloc(len)))
5454
{
5555
memcpy(str, value.Value().data(), len);
5656
str[len] = 0;
@@ -159,8 +159,9 @@ class OldMeterIdentificationAttributes
159159
}
160160
else
161161
{
162+
const auto value = mInstance->GetPointOfDelivery().Value();
162163
mInstance->SetPointOfDelivery(DataModel::MakeNullable(CharSpan::fromCharString(IncrementString(
163-
mInstance->GetPointOfDelivery().Value().data()).c_str())));
164+
std::string(value.data(), value.size())).c_str())));
164165
}
165166

166167
if (mInstance->GetMeterSerialNumber().IsNull())
@@ -169,8 +170,9 @@ class OldMeterIdentificationAttributes
169170
}
170171
else
171172
{
173+
const auto value = mInstance->GetMeterSerialNumber().Value();
172174
mInstance->SetMeterSerialNumber(DataModel::MakeNullable(CharSpan::fromCharString(IncrementString(
173-
mInstance->GetMeterSerialNumber().Value().data()).c_str())));
175+
std::string(value.data(), value.size())).c_str())));
174176
}
175177

176178
if (mInstance->GetProtocolVersion().IsNull())
@@ -179,8 +181,9 @@ class OldMeterIdentificationAttributes
179181
}
180182
else
181183
{
184+
const auto value = mInstance->GetProtocolVersion().Value();
182185
mInstance->SetProtocolVersion(DataModel::MakeNullable(CharSpan::fromCharString(IncrementString(
183-
mInstance->GetProtocolVersion().Value().data()).c_str())));
186+
std::string(value.data(), value.size())).c_str())));
184187
}
185188

186189
if (mInstance->GetPowerThreshold().IsNull())

0 commit comments

Comments
 (0)