samples: matter: Fixed issues found by static code analysis

Fixed several issues found by the coverity during static
code analysis.

Signed-off-by: Kamil Kasperczyk <[email protected]>

Author: kkasperczyk-no

samples/matter/common/src/event_triggers/default_event_triggers.cpp

@@ -119,8 +119,6 @@ CHIP_ERROR RebootCallback(TestEventTrigger::TriggerValue delayMs)
 			sys_reboot(SYS_REBOOT_WARM);
 		},
 		nullptr /* context */);
-
-	return CHIP_NO_ERROR;
 }
 
 #ifdef CONFIG_NCS_SAMPLE_MATTER_WATCHDOG_EVENT_TRIGGERS
@@ -152,7 +150,7 @@ CHIP_ERROR BlockMatterThreadCallback(TestEventTrigger::TriggerValue blockingTime
 
 		LOG_INF("Blocking Matter thread for %d seconds", blockingTimeS);
 
-		while (startTime + (blockingTimeS * 1000) > k_uptime_get()) {
+		while (startTime + static_cast<int64_t>(blockingTimeS) * 1000 > k_uptime_get()) {
 			;
 		}
 

samples/matter/common/src/event_triggers/event_triggers.cpp

@@ -37,7 +37,7 @@ CHIP_ERROR TestEventTrigger::RegisterTestEventTriggerHandler(chip::TestEventTrig
 {
 	VerifyOrReturnError(triggerDelegate != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-	for (size_t idx = 0; idx < kMaxEventTriggers; idx++) {
+	for (size_t idx = 0; idx < kMaxEventTriggersHandlers; idx++) {
 		if (mHandlers[idx] == nullptr) {
 			mHandlers[idx] = triggerDelegate;
 			return CHIP_NO_ERROR;

samples/matter/common/src/event_triggers/event_triggers.h

@@ -32,7 +32,8 @@ class TestEventTrigger : public chip::TestEventTriggerDelegate {
 	/* Define the maximum available event triggers that can be registered. */
 	constexpr static TriggerSlot kMaxEventTriggers = CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_MAX;
 	constexpr static TriggerSlot kInvalidTriggerSlot = CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_MAX + 1;
-	constexpr static TriggerSlot kMaxEventTriggersHandlers = CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_MAX_TRIGGERS_DELEGATES;
+	constexpr static TriggerSlot kMaxEventTriggersHandlers =
+		CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_MAX_TRIGGERS_DELEGATES;
 	constexpr static uint8_t kDisableEventTriggersKey[chip::TestEventTriggerDelegate::kEnableKeyLength] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	};
@@ -128,6 +129,6 @@ class TestEventTrigger : public chip::TestEventTriggerDelegate {
 	uint8_t mEnableKeyData[chip::TestEventTriggerDelegate::kEnableKeyLength] = {};
 	chip::MutableByteSpan mEnableKey{ mEnableKeyData };
 	Nrf::FiniteMap<EventTriggerId, EventTrigger, kMaxEventTriggers> mTriggersMap;
-	chip::TestEventTriggerHandler* mHandlers[kMaxEventTriggersHandlers];
+	chip::TestEventTriggerHandler *mHandlers[kMaxEventTriggersHandlers] = {};
 };
 }; // namespace Nrf::Matter

samples/matter/thermostat/src/app_task.cpp

@@ -72,7 +72,7 @@ CHIP_ERROR AppTask::Init()
 		}
 		err = TemperatureManager::Instance().Init();
 		if (err != CHIP_NO_ERROR) {
-			LOG_ERR("TempMgr Init fail");
+			LOG_ERR("TemperatureManager Init fail");
 		}
 		return err;
 	} }));

samples/matter/thermostat/src/temperature_manager.cpp

@@ -13,6 +13,8 @@ LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 using namespace chip;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::app::Clusters;
+using namespace chip::app::Clusters::Thermostat::Attributes;
+using namespace Protocols::InteractionModel;
 
 constexpr EndpointId kThermostatEndpoint = 1;
 
@@ -38,15 +40,20 @@ uint8_t ReturnRemainderValue(int16_t Value)
 
 CHIP_ERROR TemperatureManager::Init()
 {
+	CHIP_ERROR err = CHIP_NO_ERROR;
+
 	PlatformMgr().LockChipStack();
-	Thermostat::Attributes::LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius);
-	Thermostat::Attributes::OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius);
-	Thermostat::Attributes::OccupiedCoolingSetpoint::Get(kThermostatEndpoint, &mCoolingCelsiusSetPoint);
-	Thermostat::Attributes::OccupiedHeatingSetpoint::Get(kThermostatEndpoint, &mHeatingCelsiusSetPoint);
-	Thermostat::Attributes::SystemMode::Get(kThermostatEndpoint, &mThermMode);
+
+	VerifyOrExit(Status::Success == LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius), err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius), err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == OccupiedCoolingSetpoint::Get(kThermostatEndpoint, &mCoolingCelsiusSetPoint), err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == OccupiedHeatingSetpoint::Get(kThermostatEndpoint, &mHeatingCelsiusSetPoint), err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == SystemMode::Get(kThermostatEndpoint, &mThermMode), err = CHIP_IM_GLOBAL_STATUS(Failure));
+
+exit:
 	PlatformMgr().UnlockChipStack();
 
-	return CHIP_NO_ERROR;
+	return err;
 }
 
 void TemperatureManager::LogThermostatStatus()
@@ -76,31 +83,35 @@ void TemperatureManager::LogThermostatStatus()
 void TemperatureManager::AttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t *value,
 						uint16_t size)
 {
+	Status status;
+
 	switch (attributeId) {
-	case Thermostat::Attributes::LocalTemperature::Id: {
-		Thermostat::Attributes::LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius);
+	case LocalTemperature::Id: {
+		status = LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius);
+		VerifyOrReturn(Status::Success == status, LOG_ERR("Failed to get Thermostat LocalTemperature attribute"));
 	} break;
 
-	case Thermostat::Attributes::OutdoorTemperature::Id: {
-		Thermostat::Attributes::OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius);
+	case OutdoorTemperature::Id: {
+		status = OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius);
+		VerifyOrReturn(Status::Success == status, LOG_ERR("Failed to get Thermostat OutdoorTemperature attribute"));
 	} break;
 
-	case Thermostat::Attributes::OccupiedCoolingSetpoint::Id: {
+	case OccupiedCoolingSetpoint::Id: {
 		mCoolingCelsiusSetPoint = *reinterpret_cast<int16_t *>(value);
 		LOG_INF("Cooling TEMP: %d", mCoolingCelsiusSetPoint);
 	} break;
 
-	case Thermostat::Attributes::OccupiedHeatingSetpoint::Id: {
+	case OccupiedHeatingSetpoint::Id: {
 		mHeatingCelsiusSetPoint = *reinterpret_cast<int16_t *>(value);
 		LOG_INF("Heating TEMP %d", mHeatingCelsiusSetPoint);
 	} break;
 
-	case Thermostat::Attributes::SystemMode::Id: {
+	case SystemMode::Id: {
 		mThermMode = static_cast<app::Clusters::Thermostat::SystemModeEnum>(*value);
 	} break;
 
 	default: {
-		LOG_INF("Unhandled thermostat attribute %x", attributeId);
+		LOG_ERR("Unhandled thermostat attribute %x", attributeId);
 		return;
 	} break;
 	}

samples/matter/thermostat/src/temperature_measurement/sensor.cpp

@@ -37,6 +37,7 @@ constexpr int16_t sMockTemp[] = { 2000, 2731, 1600, 2100, 1937, 3011, 1500, 1899
 
 TemperatureSensor::TemperatureSensor()
 {
+	mCycleCounter = 0;
 	mMockTempIndex = 0;
 	mPreviousTemperature = startingMockedValue;
 	BindingHandler::Init();