Skip to content

btmgmt_protocol: Fix unhandled exception when decoding EIRData #14

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
martin-flaska wants to merge 1 commit into
base: main
Choose a base branch
from
Open

btmgmt_protocol: Fix unhandled exception when decoding EIRData #14

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
16 changes: 13 additions & 3 deletions btsocket/btmgmt_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,11 @@ def decode(self, data):
data_type = data[pointer + 1]
data_start = pointer + 2
data_end = data_start + len_data - 1
self.value[ADType(data_type)] = data[data_start:data_end]
try:
self.value[ADType(data_type)] = data[data_start:data_end]
except ValueError as ex:
raise ValueError(f"EIRData.decode: Invalid ADType: 0x{data_type:02x}, "
f"data len: {len(data)}, data: {data[pointer:].hex(' ')}") from ex
pointer += data[pointer] + 1

def encode(self, value, width):
Expand Down Expand Up @@ -235,8 +239,14 @@ def decode(self, pkt):
for index in range(repeated):
class_ = getattr(current_module, param.bt_type)
data_type = class_()
data_type.decode(pkt[pointer:pointer + param.width])
self._add_to_value(param, data_type.value)
try:
data_type.decode(pkt[pointer:pointer + param.width])
self._add_to_value(param, data_type.value)
except ValueError as ex:
logger.error(
f"Packet.decode: failed to decode {param.name} as {param.bt_type}. "
f"Offset: {pointer}, width: {param.width}, pkt: {pkt.hex(' ')}. Error: {ex}"
)
pointer += param.width
if pointer < len(pkt):
# self.value['parameters'] = pkt[pointer:]
Expand Down