fix length check of "discrete inputs" in DataBank

sourceperl · Jul 5, 2024 · ef2c457 · ef2c457
1 parent 8cf25cd
commit ef2c457
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 Revision history for pyModbusTCP
 
 0.2.x xxxx-xx-xx
+
+    - fix ModbusServer: wrong check of discrete inputs length in DataBank (thanks to OTnetproj).
     - updated compatibility test (python versions): remove 3.7, add 3.12.
 
 0.2.1 2023-11-21

diff --git a/pyModbusTCP/server.py b/pyModbusTCP/server.py
@@ -171,7 +171,7 @@ def get_discrete_inputs(self, address, number=1, srv_info=None):
         """
         # secure extract of data from list used by server thread
         with self._d_inputs_lock:
-            if (address >= 0) and (address + number <= len(self._coils)):
+            if (address >= 0) and (address + number <= len(self._d_inputs)):
                 return self._d_inputs[address: number + address]
             else:
                 return None
@@ -191,7 +191,7 @@ def set_discrete_inputs(self, address, bit_list):
         bit_list = [bool(b) for b in bit_list]
         # ensure atomic update of internal data
         with self._d_inputs_lock:
-            if (address >= 0) and (address + len(bit_list) <= len(self._coils)):
+            if (address >= 0) and (address + len(bit_list) <= len(self._d_inputs)):
                 for offset, b_value in enumerate(bit_list):
                     self._d_inputs[address + offset] = b_value
             else: