Skip to content

hwPortUtils.listComPorts: Don't barf when SPDRP_FRIENDLYNAME is invalid #6462

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
jcsteh merged 2 commits into from
Nov 3, 2016
Merged

hwPortUtils.listComPorts: Don't barf when SPDRP_FRIENDLYNAME is invalid #6462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24d178
Fixed another rare issue when scanning for serial ports on some syste…
jcsteh Oct 14, 2016
52057df
hwPortUtils.listComPorts: Handle PortName being empty just in case. F…
jcsteh Oct 18, 2016
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
9 changes: 6 additions & 3 deletions source/hwPortUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ def __str__(self):
# #6015: In some rare cases, this value doesn't exist.
log.debugWarning("No PortName value for hardware ID %s" % hwID)
continue
if not port:
log.debugWarning("Empty PortName value for hardware ID %s" % hwID)
continue
if hwID.startswith("BTHENUM\\"):
# This is a Microsoft bluetooth port.
try:
Expand Down Expand Up @@ -229,9 +232,9 @@ def __str__(self):
ctypes.byref(buf), ctypes.sizeof(buf) - 1,
None
):
# Ignore ERROR_INSUFFICIENT_BUFFER
if ctypes.GetLastError() != ERROR_INSUFFICIENT_BUFFER:
raise ctypes.WinError()
# #6007: SPDRP_FRIENDLYNAME sometimes doesn't exist/isn't valid.
log.debugWarning("Couldn't get SPDRP_FRIENDLYNAME for %s: %s" % (port, ctypes.WinError()))
entry["friendlyName"] = port
else:
entry["friendlyName"] = buf.value

Expand Down