Skip to content

probe: fix J-Link swo_read crash when swo_num_bytes() returns a negative value #2021

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
adityaanikam wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −1
Open

probe: fix J-Link swo_read crash when swo_num_bytes() returns a negative value #2021

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
6 changes: 5 additions & 1 deletion pyocd/probe/jlink_probe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Copyright (c) 2021-2022 Chris Reed
# Copyright (c) 2023 Marian Muller Rebeyrol
# Copyright (c) 2026 Christophe Dufaza
# Copyright (c) 2026 Aditya Nikam
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -498,7 +499,10 @@ def swo_stop(self):

def swo_read(self):
try:
return self._link.swo_read(0, self._link.swo_num_bytes(), True)
count = self._link.swo_num_bytes()
if count <= 0:
return bytearray()
return self._link.swo_read(0, count, True)
except JLinkException as exc:
raise self._convert_exception(exc) from exc

Expand Down