Skip to content

Fix some BLF files can't be read #765

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

Merged
christiansandberg merged 3 commits into from
Feb 11, 2020
Merged

Fix some BLF files can't be read #765

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32a029c
Fix some BLF files can't be read
christiansandberg Feb 8, 2020
c60a448
Fix last message not read
christiansandberg Feb 8, 2020
f70438f
Merge branch 'develop' into bugfix/763-fix-blf-reader
felixdivo Feb 11, 2020
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
13 changes: 9 additions & 4 deletions can/io/blf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ def __iter__(self):
def _parse_container(self, data):
if self._tail:
data = b"".join((self._tail, data))
self._pos = 0
try:
yield from self._parse_data(data)
except struct.error:
# Container data exhausted
# Save the remaining data that could not be processed
self._tail = data[self._pos :]
# There was not enough data in the container to unpack a struct
pass
# Save the remaining data that could not be processed
self._tail = data[self._pos :]

def _parse_data(self, data):
"""Optimized inner loop by making local copies of global variables
Expand All @@ -213,12 +213,14 @@ def _parse_data(self, data):
unpack_can_error_ext = CAN_ERROR_EXT_STRUCT.unpack_from

start_timestamp = self.start_timestamp
max_pos = len(data)
pos = 0

# Loop until a struct unpack raises an exception
while True:
self._pos = pos
header = unpack_obj_header_base(data, pos)
# print(header)
signature, _, header_version, obj_size, obj_type = header
if signature != b"LOBJ":
raise BLFParseError()
Expand All @@ -228,6 +230,9 @@ def _parse_data(self, data):
if obj_type != CAN_FD_MESSAGE_64:
# Add padding bytes
next_pos += obj_size % 4
if next_pos > max_pos:
# This object continues in the next container
return
pos += obj_header_base_size

# Read rest of header
Expand Down