From b1caa0cf0408aa40df2c40e4662bff772d753cd0 Mon Sep 17 00:00:00 2001
From: amatilda <kpk@z-wave.me>
Date: Thu, 5 Sep 2024 16:13:57 +0300
Subject: [PATCH] fix NULL pointer
---
.../arduino/zunoG2/libraries/ZMEButtons/ZMEButtons.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hardware/arduino/zunoG2/libraries/ZMEButtons/ZMEButtons.cpp b/hardware/arduino/zunoG2/libraries/ZMEButtons/ZMEButtons.cpp
index 72e62b3b..88f68732 100644
--- a/hardware/arduino/zunoG2/libraries/ZMEButtons/ZMEButtons.cpp
+++ b/hardware/arduino/zunoG2/libraries/ZMEButtons/ZMEButtons.cpp
@@ -36,9 +36,15 @@ bool ZMEVirtButtons::isReleased(uint8_t channel) {
return !isChannelPressed(channel, d);
}
bool ZMEVirtButtons::isIdled(uint8_t channel) {
+ ZMEButtonState_t *s;
+ uint8_t st;
+
zunoEnterCritical();
- ZMEButtonState_t * s = _extractChannelState(channel);
- uint8_t st = s->state;
+ s = _extractChannelState(channel);
+ if (s != NULL)
+ st = s->state;
+ else
+ st = ZMEBUTTON_STATE_IDLE;
zunoExitCritical();
return st == ZMEBUTTON_STATE_IDLE;
}