Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pymodbus/framer/tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ class FramerTLS(FramerBase):

def decode(self, data: bytes) -> tuple[int, int, int, bytes]:
"""Decode MDAP+payload."""
if (data_len := len(data)) < self.MIN_SIZE:
return data_len, 0, 0, self.EMPTY
tid = int.from_bytes(data[0:2], 'big')
dev_id = int(data[6])
return len(data), dev_id, tid, data[7:]
return data_len, dev_id, tid, data[7:]

def encode(self, payload: bytes, device_id: int, tid: int) -> bytes:
"""Encode MDAP+payload."""
Expand Down
10 changes: 10 additions & 0 deletions test/framer/test_framer.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,16 @@ def test_invalid_protocol_id_for_framer_socket(self):
assert tid == 0
assert pdu == framer.EMPTY

def test_short_packet_for_framer_tls(self):
"""Test that FramerTLS handles short packets without raising."""
framer = FramerTLS(DecodePDU(False))
data = b"\x00\x01\x00\x00\x00"
data_len, dev_id, tid, pdu = framer.decode(data)
assert data_len == len(data)
assert dev_id == 0
assert tid == 0
assert pdu == framer.EMPTY

@pytest.mark.parametrize(("entry"), [FramerType.ASCII])
@pytest.mark.parametrize(("is_server"), [False, True])
@pytest.mark.parametrize(("msg"), [
Expand Down
Loading