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

[2.7] bpo-31095: Fix potential crash during GC by methane · Pull Request #3197 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

[2.7] bpo-31095: Fix potential crash during GC #3197

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
methane merged 2 commits into from
Sep 4, 2017
Conversation 0 Commits 2 Checks 0 Files changed
Merged

[2.7] bpo-31095: Fix potential crash during GC #3197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00fea7c
bpo-31095: fix potential crash during GC (GH-2974)
methane Aug 24, 2017
caf722f
remove merge garbage
methane Aug 24, 2017
File filter

Filter by extension

Filter by extension .c  (3) 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
Prev Previous commit
remove merge garbage
  • Loading branch information
methane committed Aug 24, 2017
commit caf722ff9daf0a62cf52d8d14dbe8eef2372370b
3 changes: 0 additions & 3 deletions Modules/_elementtree.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 @@ -544,9 +544,6 @@ subelement(PyObject* self, PyObject* args, PyObject* kw)
static void
element_dealloc(ElementObject* self)
{
/* bpo-31095: UnTrack is needed before calling any callbacks */
PyObject_GC_UnTrack(self);

if (self->extra)
element_dealloc_extra(self);

Expand Down
1 change: 0 additions & 1 deletion Modules/_io/bytesio.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 @@ -746,7 +746,6 @@ static void
bytesio_dealloc(bytesio *self)
{
/* bpo-31095: UnTrack is needed before calling any callbacks */
PyObject_GC_UnTrack(self);
_PyObject_GC_UNTRACK(self);
if (self->buf != NULL) {
PyMem_Free(self->buf);
Expand Down
1 change: 1 addition & 0 deletions Modules/_ssl.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 @@ -3450,6 +3450,7 @@ static PyTypeObject PySSLContext_Type = {
};



#ifdef HAVE_OPENSSL_RAND

/* helper routines for seeding the SSL PRNG */
Expand Down
Back | FazBrowse Home | New Git URL