Strings are fixed

Author: popovdg

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

@@ -123,7 +123,7 @@ CHIP_ERROR Instance::SetPointOfDelivery(const DataModel::Nullable<CharSpan> & ne
     }
 
     const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
-    if (kMaximumStringBufferSize <= len)
+    if (kMaximumStringBufferSize < len)
     {
         return CHIP_ERROR_INVALID_STRING_LENGTH;
     }
@@ -136,7 +136,6 @@ CHIP_ERROR Instance::SetPointOfDelivery(const DataModel::Nullable<CharSpan> & ne
     if (!newValue.IsNull())
     {
         memcpy(mPointOfDeliveryBuf, newValue.Value().data(), len);
-        mPointOfDeliveryBuf[len] = 0;
         mPointOfDelivery = MakeNullable(CharSpan(mPointOfDeliveryBuf, len));
     }
 
@@ -152,7 +151,7 @@ CHIP_ERROR Instance::SetMeterSerialNumber(const DataModel::Nullable<CharSpan> &
     }
 
     const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
-    if (kMaximumStringBufferSize <= len)
+    if (kMaximumStringBufferSize < len)
     {
         return CHIP_ERROR_INVALID_STRING_LENGTH;
     }
@@ -165,7 +164,6 @@ CHIP_ERROR Instance::SetMeterSerialNumber(const DataModel::Nullable<CharSpan> &
     if (!newValue.IsNull())
     {
         memcpy(mMeterSerialNumberBuf, newValue.Value().data(), len);
-        mMeterSerialNumberBuf[len] = 0;
         mMeterSerialNumber = MakeNullable(CharSpan(mMeterSerialNumberBuf, len));
     }
 
@@ -181,7 +179,7 @@ CHIP_ERROR Instance::SetProtocolVersion(const DataModel::Nullable<CharSpan> & ne
     }
 
     const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
-    if (kMaximumStringBufferSize <= len)
+    if (kMaximumStringBufferSize < len)
     {
         return CHIP_ERROR_INVALID_STRING_LENGTH;
     }
@@ -194,7 +192,6 @@ CHIP_ERROR Instance::SetProtocolVersion(const DataModel::Nullable<CharSpan> & ne
     if (!newValue.IsNull())
     {
         memcpy(mProtocolVersionBuf, newValue.Value().data(), len);
-        mProtocolVersionBuf[len] = 0;
         mProtocolVersion = MakeNullable(CharSpan(mProtocolVersionBuf, len));
     }
 

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

@@ -60,10 +60,10 @@ class Instance : public AttributeAccessInterface
 
 private:
     // Attribute storage
-    static constexpr size_t kMaximumStringBufferSize = 65;
-    char mPointOfDeliveryBuf[kMaximumStringBufferSize] = {};
-    char mMeterSerialNumberBuf[kMaximumStringBufferSize] = {};
-    char mProtocolVersionBuf[kMaximumStringBufferSize] = {};
+    static constexpr size_t kMaximumStringSize = 64;
+    char mPointOfDeliveryBuf[kMaximumStringSize] = {};
+    char mMeterSerialNumberBuf[kMaximumStringSize] = {};
+    char mProtocolVersionBuf[kMaximumStringSize] = {};
     DataModel::Nullable<MeterTypeEnum> mMeterType;
     DataModel::Nullable<CharSpan> mPointOfDelivery;
     DataModel::Nullable<CharSpan> mMeterSerialNumber;