Merge pull request #1840 from mheyse/fix/check-parameter-order

fix: nullptr linter error
emsesp · Jul 4, 2024 · 6b6224d · 6b6224d
2 parents a0ca1ce + 8c810f2
commit 6b6224d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/modbus.cpp b/src/modbus.cpp
@@ -65,8 +65,10 @@ bool Modbus::check_parameter_order() {
     for (const auto & mi : modbus_register_mappings) {
         if (isFirst) {
             isFirst = false;
-        } else if (prev == nullptr || !prev->isLessThan(mi)) {
-            // TODO fix nullptr dereference when printing
+        } else if (prev == nullptr) {
+            LOG_ERROR("Error checking modbus parameters %s.", mi.short_name);
+            return false;
+        } else if(!prev->isLessThan(mi)) {
             LOG_ERROR("Error in modbus parameters: %s must be listed before %s.", mi.short_name, prev->short_name);
             return false;
         }