◐ Shell
reader mode source ↗
Skip to content

bpo-38282: Rewrite getsockaddrarg() helper function#16698

Merged
vstinner merged 1 commit into
python:masterfrom
vstinner:getsockaddrarg
Oct 10, 2019
Merged

bpo-38282: Rewrite getsockaddrarg() helper function#16698
vstinner merged 1 commit into
python:masterfrom
vstinner:getsockaddrarg

Conversation

@vstinner

@vstinner vstinner commented Oct 10, 2019 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

Rewrite getsockaddrarg() helper function of socketmodule.c (_socket
module) to prevent a false alarm when compiling codde using GCC with
_FORTIFY_SOURCE=2. Pass a pointer of the sock_addr_t union, rather
than passing a pointer to a sockaddr structure.

Add "struct sockaddr_tipc tipc;" to the sock_addr_t union.

https://bugs.python.org/issue38282

@vstinner
bpo-38282: Rewrite getsockaddrarg() helper function …
f2b237d 
Rewrite getsockaddrarg() helper function of socketmodule.c (_socket
module) to prevent a false alarm when compiling codde using GCC with
_FORTIFY_SOURCE=2. Pass a pointer of the sock_addr_t union, rather
than passing a pointer to a sockaddr structure.

Add "struct sockaddr_tipc tipc;" to the sock_addr_t union.
@vstinner

vstinner commented Oct 10, 2019

Copy link
Copy Markdown
Member Author

@nanjekyejoannah @pablogsal @pitrou @tiran: Would you mind to review this change?

@vstinner

vstinner commented Oct 10, 2019

Copy link
Copy Markdown
Member Author

I tested manually that this change fix the GCC compiler warning when using:

./configure CFLAGS="-D_FORTIFY_SOURCE=2 -O3"
make clean
make

pitrou
pitrou approved these changes Oct 10, 2019
View reviewed changes

@pitrou pitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

LGTM. A bit cleaner too.

@vstinner

vstinner commented Oct 10, 2019

Copy link
Copy Markdown
Member Author

LGTM. A bit cleaner too.

It helps static analyzers to follow the size of the storage.

@vstinner vstinner merged commit d565fb9 into python:master Oct 10, 2019
@vstinner vstinner deleted the getsockaddrarg branch October 10, 2019 19:30
@miss-islington

miss-islington commented Oct 10, 2019

Copy link
Copy Markdown
Contributor

Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 10, 2019
@vstinner @miss-islington
bpo-38282: Rewrite getsockaddrarg() helper function (pythonGH-16698) …
2c147f7 
Rewrite getsockaddrarg() helper function of socketmodule.c (_socket
module) to prevent a false alarm when compiling codde using GCC with
_FORTIFY_SOURCE=2. Pass a pointer of the sock_addr_t union, rather
than passing a pointer to a sockaddr structure.

Add "struct sockaddr_tipc tipc;" to the sock_addr_t union.
(cherry picked from commit d565fb9)

Co-authored-by: Victor Stinner <vstinner@python.org>
@bedevere-bot

bedevere-bot commented Oct 10, 2019

Copy link
Copy Markdown

GH-16706 is a backport of this pull request to the 3.8 branch.

@vstinner

vstinner commented Oct 10, 2019

Copy link
Copy Markdown
Member Author

There are failures on FreeBSD. I close the 3.8 backport.

jacobneiltaylor pushed a commit to jacobneiltaylor/cpython that referenced this pull request Dec 5, 2019
@vstinner
bpo-38282: Rewrite getsockaddrarg() helper function (pythonGH-16698) …
6bbc263 
Rewrite getsockaddrarg() helper function of socketmodule.c (_socket
module) to prevent a false alarm when compiling codde using GCC with
_FORTIFY_SOURCE=2. Pass a pointer of the sock_addr_t union, rather
than passing a pointer to a sockaddr structure.

Add "struct sockaddr_tipc tipc;" to the sock_addr_t union.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pitrou pitrou pitrou approved these changes

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vstinner @miss-islington @bedevere-bot @pitrou @the-knights-who-say-ni