Reorder member varible for memory holes, validated buffer size before storing to userActiveModeTriggerInstruction

Author: jadhavrohit924

src/app/clusters/icd-management-server/CodegenIntegration.cpp

@@ -62,7 +62,7 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
             Protocols::InteractionModel::Status::Success)
         {
             ChipLogError(Zcl, "Failed to get UserActiveModeTriggerHint, using default (0)");
-            userActiveModeTriggerHint = BitMask<IcdManagement::UserActiveModeTriggerBitmap>(0);
+            userActiveModeTriggerHint.ClearAll();
         }
 
         // Get UserActiveModeTriggerInstruction

src/app/clusters/icd-management-server/ICDManagementCluster.cpp

@@ -96,13 +96,15 @@ ICDManagementCluster::ICDManagementCluster(EndpointId endpointId, Crypto::Symmet
                                            CharSpan userActiveModeTriggerInstruction) :
     DefaultServerCluster({ endpointId, IcdManagement::Id }),
     mSymmetricKeystore(symmetricKeystore), mFabricTable(fabricTable), mICDConfigurationData(icdConfigurationData),
-    mOptionalAttributeSet(optionalAttributeSet), mEnabledCommands(enabledCommands),
-    mUserActiveModeTriggerBitmap(userActiveModeTriggerBitmap),
-    mUserActiveModeTriggerInstructionLength(static_cast<uint8_t>(
-        std::min(userActiveModeTriggerInstruction.size(), IcdManagement::kUserActiveModeTriggerInstructionMaxLength)))
+    mOptionalAttributeSet(optionalAttributeSet), mUserActiveModeTriggerBitmap(userActiveModeTriggerBitmap),
+    mEnabledCommands(enabledCommands), mUserActiveModeTriggerInstructionLength(0)
 {
+    static_assert(sizeof(mUserActiveModeTriggerInstruction) <= UINT8_MAX,
+                  "mUserActiveModeTriggerInstruction size must fit in uint8_t");
+
     MutableCharSpan buffer(mUserActiveModeTriggerInstruction);
     CopyCharSpanToMutableCharSpanWithTruncation(userActiveModeTriggerInstruction, buffer);
+    mUserActiveModeTriggerInstructionLength = static_cast<uint8_t>(buffer.size());
 }
 
 DataModel::ActionReturnStatus ICDManagementCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,

src/app/clusters/icd-management-server/ICDManagementCluster.h

@@ -104,10 +104,10 @@ class ICDManagementCluster : public DefaultServerCluster
     FabricTable & mFabricTable;
     ICDConfigurationData & mICDConfigurationData;
     const OptionalAttributeSet mOptionalAttributeSet;
-    const BitMask<IcdManagement::OptionalCommands> mEnabledCommands;
     const BitMask<IcdManagement::UserActiveModeTriggerBitmap> mUserActiveModeTriggerBitmap;
+    const BitMask<IcdManagement::OptionalCommands> mEnabledCommands;
+    uint8_t mUserActiveModeTriggerInstructionLength;
     char mUserActiveModeTriggerInstruction[IcdManagement::kUserActiveModeTriggerInstructionMaxLength];
-    const uint8_t mUserActiveModeTriggerInstructionLength;
 };
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP