Make sure there is space before appending

Author: ratgr

src/app/clusters/device-energy-management-server/device-energy-management-server.cpp

@@ -116,8 +116,8 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
 
     if (HasFeature(Feature::kStartTimeAdjustment))
     {
-        ReturnErrorOnFailure(builder.Append({ StartTimeAdjustRequest::Id, {} } //
-                                            ));
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
+        ReturnErrorOnFailure(builder.Append({ StartTimeAdjustRequest::Id, {} }));
     }
 
     if (HasFeature(Feature::kPausable))
@@ -130,17 +130,20 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
 
     if (HasFeature(Feature::kForecastAdjustment))
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         ReturnErrorOnFailure(builder.Append({ ModifyForecastRequest::Id, {} }));
     }
 
     if (HasFeature(Feature::kConstraintBasedAdjustment))
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         ReturnErrorOnFailure(builder.Append({ RequestConstraintBasedForecast::Id, {} }));
     }
 
     if (HasFeature(Feature::kStartTimeAdjustment) || HasFeature(Feature::kForecastAdjustment) ||
         HasFeature(Feature::kConstraintBasedAdjustment))
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         ReturnErrorOnFailure(builder.Append({ CancelRequest::Id, {} }));
     }
 

src/app/clusters/energy-evse-server/energy-evse-server.cpp

@@ -196,6 +196,7 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
 
     if (HasFeature(Feature::kV2x))
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         ReturnErrorOnFailure(builder.Append({ EnableDischarging::Id, QF::kTimed, kDefaultPrivilege }));
     }
 
@@ -210,6 +211,7 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
 
     if (SupportsOptCmd(OptionalCommands::kSupportsStartDiagnostics))
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         ReturnErrorOnFailure(builder.Append({ StartDiagnostics::Id, QF::kTimed, kDefaultPrivilege }));
     }
     return CHIP_NO_ERROR;

src/app/clusters/network-commissioning/network-commissioning.cpp

@@ -1408,6 +1408,7 @@ CHIP_ERROR Instance::EnumerateGeneratedCommands(const ConcreteClusterPath & clus
 
     if (mFeatureFlags.Has(Feature::kPerDeviceCredentials))
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         ReturnErrorOnFailure(builder.Append(QueryIdentityResponse::Id));
     }
 

src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp

@@ -194,6 +194,7 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
     ChipLogDetail(Zcl, "resourcemonitoring: EnumerateAcceptedCommands");
     if (mResetConditionCommandSupported)
     {
+        ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         return builder.Append({ ResetCondition::Id, {} });
     }
 

src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp

@@ -180,7 +180,7 @@ SoftwareDiagnosticsCommandHandler::EnumerateAcceptedCommands(const ConcreteClust
         // No commmands.
         return CHIP_NO_ERROR;
     }
-
+    ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
     return builder.Append({ ResetWatermarks::Id, {}, Privilege::kOperate }); // From Matter Spec
 }
 

src/controller/tests/TestServerCommandDispatch.cpp

@@ -121,6 +121,7 @@ CHIP_ERROR TestClusterCommandHandler::EnumerateAcceptedCommands(const ConcreteCl
     }
 
     // We just have one command id.
+    ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
     ReturnErrorOnFailure(builder.Append({ TestSimpleArgumentRequest::Id, {} }));
     return CHIP_NO_ERROR;
 }