Skip to content

Fix BLFParseError #806

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
hardbyte merged 2 commits into from
Apr 19, 2020
Merged

Fix BLFParseError #806

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f6400f
Seek for start of object instead of calculating it
christiansandberg Apr 10, 2020
0042330
Merge branch 'develop' into bugfix/803-blf-parse-error
hardbyte Apr 19, 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 @@ -175,7 +175,7 @@ def __iter__(self):

if obj_type == LOG_CONTAINER:
method, uncompressed_size = LOG_CONTAINER_STRUCT.unpack_from(obj_data)
container_data = memoryview(obj_data)[LOG_CONTAINER_STRUCT.size :]
container_data = obj_data[LOG_CONTAINER_STRUCT.size :]
if method == NO_COMPRESSION:
data = container_data
elif method == ZLIB_DEFLATE:
Expand Down Expand Up @@ -220,6 +220,14 @@ def _parse_data(self, data):
# Loop until a struct unpack raises an exception
while True:
self._pos = pos
# Find next object after padding (depends on object type)
try:
pos = data.index(b"LOBJ", pos, pos + 8)
except ValueError:
if pos + 8 > max_pos:
# Not enough data in container
return
raise BLFParseError("Could not find next object")
header = unpack_obj_header_base(data, pos)
# print(header)
signature, _, header_version, obj_size, obj_type = header
Expand All @@ -228,9 +236,6 @@ def _parse_data(self, data):

# Calculate position of next object
next_pos = pos + obj_size
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
Expand Down