Skip to content

Fix SeeedStudio recv crash on empty serial read #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafrivacation wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

Fix SeeedStudio recv crash on empty serial read #2072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions can/interfaces/seeedstudio/seeedstudio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,10 @@ def _recv_internal(self, timeout):

if rx_byte_1 and ord(rx_byte_1) == 0xAA:
try:
rx_byte_2 = ord(self.ser.read())
rx_byte_2_raw = self.ser.read()
if not rx_byte_2_raw:
return None, self._is_filtered
rx_byte_2 = rx_byte_2_raw[0]

time_stamp = time()
if rx_byte_2 == 0x55:
Expand All @@ -286,7 +289,10 @@ def _recv_internal(self, timeout):
arb_id = (struct.unpack("<H", s_3_4))[0]

data = bytearray(self.ser.read(length))
end_packet = ord(self.ser.read())
end_packet_raw = self.ser.read()
if not end_packet_raw:
return None, self._is_filtered
end_packet = end_packet_raw[0]
if end_packet == 0x55:
msg = Message(
timestamp=time_stamp,
Expand Down