Strings are fixed

Author: popovdg

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

@@ -34,7 +34,6 @@ using namespace chip::app::Clusters::MeterIdentification;
 using namespace chip::app::Clusters::MeterIdentification::Attributes;
 
 using chip::Protocols::InteractionModel::Status;
-
 namespace {
 bool NullableCharSpanCompare(const DataModel::Nullable<CharSpan> & a, const DataModel::Nullable<CharSpan> & b)
 {
@@ -123,7 +122,7 @@ CHIP_ERROR Instance::SetPointOfDelivery(const DataModel::Nullable<CharSpan> & ne
     }
 
     const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
-    if (kMaximumStringBufferSize <= len)
+    if (kMaximumStringSize < len)
     {
         return CHIP_ERROR_INVALID_STRING_LENGTH;
     }
@@ -136,7 +135,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 +150,7 @@ CHIP_ERROR Instance::SetMeterSerialNumber(const DataModel::Nullable<CharSpan> &
     }
 
     const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
-    if (kMaximumStringBufferSize <= len)
+    if (kMaximumStringSize < len)
     {
         return CHIP_ERROR_INVALID_STRING_LENGTH;
     }
@@ -165,7 +163,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 +178,7 @@ CHIP_ERROR Instance::SetProtocolVersion(const DataModel::Nullable<CharSpan> & ne
     }
 
     const size_t len = newValue.IsNull() ? 0 : newValue.Value().size();
-    if (kMaximumStringBufferSize <= len)
+    if (kMaximumStringSize < len)
     {
         return CHIP_ERROR_INVALID_STRING_LENGTH;
     }
@@ -194,7 +191,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));
     }
 
@@ -235,6 +231,8 @@ CHIP_ERROR Instance::SetPowerThreshold(const DataModel::Nullable<Globals::Struct
     return CHIP_NO_ERROR;
 }
 
+
+
 // AttributeAccessInterface
 CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
@@ -254,7 +252,7 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
         break;
 
     case MeterSerialNumber::Id:
-        ReturnErrorOnFailure(aEncoder.Encode(GetMeterSerialNumber()));;
+        ReturnErrorOnFailure(aEncoder.Encode(GetMeterSerialNumber()));
         break;
 
     case ProtocolVersion::Id:

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

@@ -51,7 +51,7 @@ class Instance : public AttributeAccessInterface
     DataModel::Nullable<CharSpan> GetProtocolVersion() { return mProtocolVersion; }
     DataModel::Nullable<Globals::Structs::PowerThresholdStruct::Type> GetPowerThreshold() { return mPowerThreshold; }
 
-     // Internal Application API to set attribute values
+    // Internal Application API to set attribute values
     CHIP_ERROR SetMeterType(const DataModel::Nullable<MeterTypeEnum> & value);
     CHIP_ERROR SetPointOfDelivery(const DataModel::Nullable<CharSpan> & value);
     CHIP_ERROR SetMeterSerialNumber(const DataModel::Nullable<CharSpan> & value);
@@ -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;
@@ -79,4 +79,4 @@ class Instance : public AttributeAccessInterface
 } // namespace MeterIdentification
 } // namespace Clusters
 } // namespace app
-} // namespace chip 
+} // namespace chip