ha: fix uninitialized sensor info

and double-check that we really have magnitudes available fix #2572
xoseperez · Jan 11, 2023 · d798052 · d798052
1 parent 94fff47
commit d798052
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/code/espurna/homeassistant.cpp b/code/espurna/homeassistant.cpp
@@ -341,7 +341,8 @@ class RelayDiscovery : public Discovery {
  }
 
  bool ok() const override {
- return (_relays) && (_index < _relays);
+ return (_relays > 0)
+ && (_index < _relays);
  }
 
  const String& uniqueId() {
@@ -692,7 +693,11 @@ class SensorDiscovery : public Discovery {
  explicit SensorDiscovery(Context& ctx) :
  _ctx(ctx),
  _magnitudes(magnitudeCount())
- {}
+ {
+ if (_magnitudes > 0) {
+ _info = magnitudeInfo(_index);
+ }
+ }
 
  JsonObject& root() {
  if (!_root) {
@@ -703,7 +708,8 @@ class SensorDiscovery : public Discovery {
  }
 
  bool ok() const override {
- return _index < _magnitudes;
+ return (_magnitudes > 0)
+ && (_index < _magnitudes);
  }
 
  const String& topic() override {