Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #10133: Make multiprocessing deallocate buffer if socket read fails. 

Patch by Hallvard B Furuseth.
This commit is contained in:
Richard Oudkerk 2012-06-11 15:12:12 +01:00
parent 2a2ce4f673
commit 197651b4e3
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -70,6 +70,9 @@ Core and Builtins
Library Library
------- -------
- Issue #10133: Make multiprocessing deallocate buffer if socket read
fails. Patch by Hallvard B Furuseth.
- Issue #13854: Make multiprocessing properly handle non-integer - Issue #13854: Make multiprocessing properly handle non-integer
non-string argument to SystemExit. non-string argument to SystemExit.

25
Modules/_multiprocessing/socket_connection.c
View File

@ -117,7 +117,7 @@ static Py_ssize_t
conn_recv_string(ConnectionObject *conn, char *buffer, conn_recv_string(ConnectionObject *conn, char *buffer,
size_t buflength, char **newbuffer, size_t maxlength) size_t buflength, char **newbuffer, size_t maxlength)
{ {
int res; Py_ssize_t res;
UINT32 ulength; UINT32 ulength;
*newbuffer = NULL; *newbuffer = NULL;
@ -132,20 +132,23 @@ conn_recv_string(ConnectionObject *conn, char *buffer,
if (ulength > maxlength) if (ulength > maxlength)
return MP_BAD_MESSAGE_LENGTH; return MP_BAD_MESSAGE_LENGTH;
if (ulength <= buflength) { if (ulength > buflength) {
*newbuffer = buffer = PyMem_Malloc((size_t)ulength);
if (buffer == NULL)
return MP_MEMORY_ERROR;
}
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
res = _conn_recvall(conn->handle, buffer, (size_t)ulength); res = _conn_recvall(conn->handle, buffer, (size_t)ulength);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
return res < 0 ? res : ulength;
} else { if (res >= 0) {
*newbuffer = PyMem_Malloc((size_t)ulength); res = (Py_ssize_t)ulength;
if (*newbuffer == NULL) } else if (*newbuffer != NULL) {
return MP_MEMORY_ERROR; PyMem_Free(*newbuffer);
Py_BEGIN_ALLOW_THREADS *newbuffer = NULL;
res = _conn_recvall(conn->handle, *newbuffer, (size_t)ulength);
Py_END_ALLOW_THREADS
return res < 0 ? (Py_ssize_t)res : (Py_ssize_t)ulength;
} }
return res;
} }
/* /*