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

bpo-32710: Fix _overlapped.Overlapped memory leaks by vstinner · Pull Request #11489 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-32710: Fix _overlapped.Overlapped memory leaks #11489

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 2 commits into from
Jan 11, 2019
Conversation 11 Commits 2 Checks 0 Files changed
Merged

bpo-32710: Fix _overlapped.Overlapped memory leaks #11489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c1c1f
bpo-32710: Fix _overlapped.Overlapped memory leaks
vstinner Jan 10, 2019
85c3b73
fix typo
vstinner Jan 11, 2019
File filter

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types 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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-01-10-15-55-10.bpo-32710.KwECPu.rst
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
@@ -0,0 +1,2 @@
Fix memory leaks in asyncio ProactorEventLoop on overlapped operation
failure.
78 changes: 54 additions & 24 deletions Modules/overlapped.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 @@ -561,6 +561,28 @@ Overlapped_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return (PyObject *)self;
}


/* Note (bpo-32710): OverlappedType.tp_clear is not defined to not release
buffers while overlapped are still running, to prevent a crash. */
static int
Overlapped_clear(OverlappedObject *self)
{
switch (self->type) {
case TYPE_READ:
case TYPE_ACCEPT:
Py_CLEAR(self->allocated_buffer);
break;
case TYPE_WRITE:
case TYPE_READINTO:
if (self->user_buffer.obj) {
PyBuffer_Release(&self->user_buffer);
}
break;
}
self->type = TYPE_NOT_STARTED;
return 0;
}

static void
Overlapped_dealloc(OverlappedObject *self)
{
Expand Down Expand Up @@ -594,20 +616,11 @@ Overlapped_dealloc(OverlappedObject *self)
}
}

if (self->overlapped.hEvent != NULL)
if (self->overlapped.hEvent != NULL) {
CloseHandle(self->overlapped.hEvent);

switch (self->type) {
case TYPE_READ:
case TYPE_ACCEPT:
Py_CLEAR(self->allocated_buffer);
break;
case TYPE_WRITE:
case TYPE_READINTO:
if (self->user_buffer.obj)
PyBuffer_Release(&self->user_buffer);
break;
}

Overlapped_clear(self);
PyObject_Del(self);
SetLastError(olderr);
}
Expand Down Expand Up @@ -723,8 +736,7 @@ do_ReadFile(OverlappedObject *self, HANDLE handle,
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
PyBuffer_Release(&self->user_buffer);
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -827,7 +839,7 @@ do_WSARecv(OverlappedObject *self, HANDLE handle,
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -955,7 +967,7 @@ Overlapped_WriteFile(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1012,8 +1024,7 @@ Overlapped_WSASend(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
PyBuffer_Release(&self->user_buffer);
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1063,7 +1074,7 @@ Overlapped_AcceptEx(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1155,7 +1166,7 @@ Overlapped_ConnectEx(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1194,7 +1205,7 @@ Overlapped_DisconnectEx(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1249,7 +1260,7 @@ Overlapped_TransmitFile(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1290,7 +1301,7 @@ Overlapped_ConnectNamedPipe(OverlappedObject *self, PyObject *args)
case ERROR_IO_PENDING:
Py_RETURN_FALSE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1340,6 +1351,25 @@ Overlapped_getpending(OverlappedObject *self)
self->type != TYPE_NOT_STARTED);
}

static int
Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
{
switch (self->type) {
case TYPE_READ:
case TYPE_ACCEPT:
Py_VISIT(self->allocated_buffer);
break;
case TYPE_WRITE:
case TYPE_READINTO:
if (self->user_buffer.obj) {
Py_VISIT(&self->user_buffer.obj);
}
break;
}
return 0;
}


static PyMethodDef Overlapped_methods[] = {
{"getresult", (PyCFunction) Overlapped_getresult,
METH_VARARGS, Overlapped_getresult_doc},
Expand Down Expand Up @@ -1410,7 +1440,7 @@ PyTypeObject OverlappedType = {
/* tp_as_buffer */ 0,
/* tp_flags */ Py_TPFLAGS_DEFAULT,
/* tp_doc */ "OVERLAPPED structure wrapper",
/* tp_traverse */ 0,
/* tp_traverse */ (traverseproc)Overlapped_traverse,
/* tp_clear */ 0,
/* tp_richcompare */ 0,
/* tp_weaklistoffset */ 0,
Expand Down
Back | FazBrowse Home | New Git URL