Skip to content

bpo-31927: Fix bugs in socketmodule.c on NetBSD and other issues.#4235

Merged
serhiy-storchaka merged 3 commits into
python:masterfrom
serhiy-storchaka:netbsd8-socket
Nov 9, 2017
Merged

bpo-31927: Fix bugs in socketmodule.c on NetBSD and other issues.#4235
serhiy-storchaka merged 3 commits into
python:masterfrom
serhiy-storchaka:netbsd8-socket

Conversation

@serhiy-storchaka
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka commented Nov 2, 2017 •
edited by bedevere-bot
Loading

  • Fix compilation of the socket module on NetBSD 8.
  • Fix the assertion failure or reading arbitrary data when parse
    a AF_BLUETOOTH address on NetBSD and DragonFly BSD.
  • Fix other potential errors and make the code more reliable.

https://bugs.python.org/issue31927

@serhiy-storchaka
bpo-31927: Fix bugs in socketmodule.c on NetBSD and other issues.
9e51a92 
* Fix compilation of the socket module on NetBSD 8.
* Fix the assertion failure or reading arbitrary data when parse
  a AF_BLUETOOTH address on NetBSD and DragonFly BSD.
* Fix other potential errors and make the code more reliable.
@serhiy-storchaka serhiy-storchaka added needs backport to 2.7 type-bug An unexpected behavior, bug, or error labels Nov 2, 2017
vstinner
vstinner approved these changes Nov 6, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM.

I just don't feel able to review the non-straighforward changes on the CAN protocol.

Comment thread Modules/socketmodule.c
"wrong format");
return 0;
}
straddr = PyBytes_AS_STRING(args);
Copy link
Copy Markdown
Member

@vstinner vstinner Nov 6, 2017

Choose a reason for hiding this comment

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

You can declare straddr here thanks to C99!

const char *straddr = PyBytes_AS_STRING(args);

Copy link
Copy Markdown
Member Author

@serhiy-storchaka serhiy-storchaka Nov 9, 2017

Choose a reason for hiding this comment

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

This change will be backported.

@serhiy-storchaka serhiy-storchaka merged commit d318715 into python:master Nov 9, 2017
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Nov 9, 2017

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@serhiy-storchaka serhiy-storchaka deleted the netbsd8-socket branch November 9, 2017 16:00
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Nov 9, 2017

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker d3187158c09cf899e9849f335bdff10594209167 3.6

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Nov 9, 2017

Sorry, @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker d3187158c09cf899e9849f335bdff10594209167 2.7

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Nov 9, 2017
@serhiy-storchaka
[3.6] bpo-31927: Fix bugs in socketmodule.c on NetBSD and other issue…
462f914 
…s. (pythonGH-4235)

* Fix compilation of the socket module on NetBSD 8.
* Fix the assertion failure or reading arbitrary data when parse
  a AF_BLUETOOTH address on NetBSD and DragonFly BSD.
* Fix other potential errors and make the code more reliable..
(cherry picked from commit d318715)
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Nov 9, 2017

GH-4352 is a backport of this pull request to the 3.6 branch.

serhiy-storchaka added a commit that referenced this pull request Nov 9, 2017
@serhiy-storchaka
[3.6] bpo-31927: Fix bugs in socketmodule.c on NetBSD and other issue…
596286f 
…s. (GH-4235) (#4352)

* Fix compilation of the socket module on NetBSD 8.
* Fix the assertion failure or reading arbitrary data when parse
  a AF_BLUETOOTH address on NetBSD and DragonFly BSD.
* Fix other potential errors and make the code more reliable.
(cherry picked from commit d318715)
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Nov 9, 2017
@serhiy-storchaka
[2.7] bpo-31927: Fix reading arbitrary data when parse a AF_BLUETOOTH…
3b26e9f 
… address (pythonGH-4235) (pythonGH-4352)

on NetBSD and DragonFly BSD.
(cherry picked from commit d318715).
(cherry picked from commit 596286f)
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Nov 9, 2017

GH-4355 is a backport of this pull request to the 2.7 branch.

serhiy-storchaka added a commit that referenced this pull request Nov 9, 2017
@serhiy-storchaka
[2.7] bpo-31927: Fix reading arbitrary data when parse a AF_BLUETOOTH…
1bce4ef 
… address (GH-4235) (GH-4352) (#4355)

on NetBSD and DragonFly BSD.
(cherry picked from commit d318715).
(cherry picked from commit 596286f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinner vstinner vstinner approved these changes

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

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