Skip to content

Commit beb4fdc

Browse files
committed
Strings are fixed
1 parent a6e3a9e commit beb4fdc

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/app/clusters/meter-identification-server/meter-identification-server.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ CHIP_ERROR Instance::SetPointOfDelivery(const DataModel::Nullable<CharSpan> & ne
123123
}
124124

125125
const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
126-
if (kMaximumStringBufferSize <= len)
126+
if (kMaximumStringBufferSize < len)
127127
{
128128
return CHIP_ERROR_INVALID_STRING_LENGTH;
129129
}
@@ -136,7 +136,6 @@ CHIP_ERROR Instance::SetPointOfDelivery(const DataModel::Nullable<CharSpan> & ne
136136
if (!newValue.IsNull())
137137
{
138138
memcpy(mPointOfDeliveryBuf, newValue.Value().data(), len);
139-
mPointOfDeliveryBuf[len] = 0;
140139
mPointOfDelivery = MakeNullable(CharSpan(mPointOfDeliveryBuf, len));
141140
}
142141

@@ -152,7 +151,7 @@ CHIP_ERROR Instance::SetMeterSerialNumber(const DataModel::Nullable<CharSpan> &
152151
}
153152

154153
const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
155-
if (kMaximumStringBufferSize <= len)
154+
if (kMaximumStringBufferSize < len)
156155
{
157156
return CHIP_ERROR_INVALID_STRING_LENGTH;
158157
}
@@ -165,7 +164,6 @@ CHIP_ERROR Instance::SetMeterSerialNumber(const DataModel::Nullable<CharSpan> &
165164
if (!newValue.IsNull())
166165
{
167166
memcpy(mMeterSerialNumberBuf, newValue.Value().data(), len);
168-
mMeterSerialNumberBuf[len] = 0;
169167
mMeterSerialNumber = MakeNullable(CharSpan(mMeterSerialNumberBuf, len));
170168
}
171169

@@ -181,7 +179,7 @@ CHIP_ERROR Instance::SetProtocolVersion(const DataModel::Nullable<CharSpan> & ne
181179
}
182180

183181
const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
184-
if (kMaximumStringBufferSize <= len)
182+
if (kMaximumStringBufferSize < len)
185183
{
186184
return CHIP_ERROR_INVALID_STRING_LENGTH;
187185
}
@@ -194,7 +192,6 @@ CHIP_ERROR Instance::SetProtocolVersion(const DataModel::Nullable<CharSpan> & ne
194192
if (!newValue.IsNull())
195193
{
196194
memcpy(mProtocolVersionBuf, newValue.Value().data(), len);
197-
mProtocolVersionBuf[len] = 0;
198195
mProtocolVersion = MakeNullable(CharSpan(mProtocolVersionBuf, len));
199196
}
200197

src/app/clusters/meter-identification-server/meter-identification-server.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ class Instance : public AttributeAccessInterface
6060

6161
private:
6262
// Attribute storage
63-
static constexpr size_t kMaximumStringBufferSize = 65;
64-
char mPointOfDeliveryBuf[kMaximumStringBufferSize] = {};
65-
char mMeterSerialNumberBuf[kMaximumStringBufferSize] = {};
66-
char mProtocolVersionBuf[kMaximumStringBufferSize] = {};
63+
static constexpr size_t kMaximumStringSize = 64;
64+
char mPointOfDeliveryBuf[kMaximumStringSize] = {};
65+
char mMeterSerialNumberBuf[kMaximumStringSize] = {};
66+
char mProtocolVersionBuf[kMaximumStringSize] = {};
6767
DataModel::Nullable<MeterTypeEnum> mMeterType;
6868
DataModel::Nullable<CharSpan> mPointOfDelivery;
6969
DataModel::Nullable<CharSpan> mMeterSerialNumber;

0 commit comments

Comments
 (0)