FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-111178: Fix getsockaddrarg() undefined behavior by vstinner · Pull Request #131668 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-111178: Fix getsockaddrarg() undefined behavior #131668

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
vstinner merged 12 commits into from
Apr 1, 2025
Conversation 38 Commits 12 Checks 0 Files changed
Merged

gh-111178: Fix getsockaddrarg() undefined behavior #131668

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
88fc5c2
gh-111178: Fix getsockaddrarg() undefined behavior
vstinner Mar 24, 2025
1aebf4c
Simplify code
vstinner Mar 24, 2025
9eb932c
Initialize cid to 0
vstinner Mar 24, 2025
533a478
Use 'unsigned short' type
vstinner Mar 28, 2025
9968c1e
Use 'unsigned char'
vstinner Mar 28, 2025
a95b22d
Add NEWS entry
vstinner Mar 28, 2025
18ed09e
Use 'unsigned long' to parse channel on Windows
vstinner Mar 28, 2025
99dcf45
Fix BTPROTO_HCI on FreeBSD
vstinner Apr 1, 2025
c0d7d03
Update BTPROTO_HCI code
vstinner Apr 1, 2025
7178cfd
Change exception type to ValueError
vstinner Apr 1, 2025
94f7b6f
Remove outdated comments
vstinner Apr 1, 2025
7455bf5
Remove useless assignment
vstinner Apr 1, 2025
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Next Next commit
gh-111178: Fix getsockaddrarg() undefined behavior 
Don't pass direct references to sockaddr members since their type may
not match PyArg_ParseTuple() types. Instead, use temporary 'int' and
'unsigned char' variables, and update sockaddr members afterwards.
  • Loading branch information
vstinner committed Mar 24, 2025
commit 88fc5c2b23baae9b7a1b564732ebb7e2c9c854cf
13 changes: 10 additions & 3 deletions Modules/socketmodule.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2045,14 +2045,21 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
memset(addr, 0, sizeof(struct sockaddr_l2));
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
_BT_L2_MEMB(addr, bdaddr_type) = BDADDR_BREDR;
int psm;
int cid = _BT_L2_MEMB(addr, cid);
unsigned char bdaddr_type = _BT_L2_MEMB(addr, bdaddr_type);
Comment thread
picnixz marked this conversation as resolved.
Resolved
if (!PyArg_ParseTuple(args, "si|iB", &straddr,
&_BT_L2_MEMB(addr, psm),
&_BT_L2_MEMB(addr, cid),
&_BT_L2_MEMB(addr, bdaddr_type))) {
&psm,
&cid,
&bdaddr_type)) {
PyErr_Format(PyExc_OSError,
"%s(): wrong format", caller);
return 0;
}
_BT_L2_MEMB(addr, psm) = psm;
_BT_L2_MEMB(addr, cid) = cid;
_BT_L2_MEMB(addr, bdaddr_type) = bdaddr_type;

if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
return 0;

Expand Down
Back | FazBrowse Home | New Git URL