mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 13:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 86804 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86804 | stefan.krah | 2010-11-26 13:58:05 +0100 (Fri, 26 Nov 2010) | 1 line

  Issue #10383: Fix two leaks.
........
This commit is contained in:
Stefan Krah 2010-11-26 15:06:27 +00:00
parent 918c90ce06
commit acaab2ae1c
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/posixmodule.c
View file

@ -6572,8 +6572,10 @@ posix_read(PyObject *self, PyObject *args)
buffer = PyString_FromStringAndSize((char *)NULL, size); buffer = PyString_FromStringAndSize((char *)NULL, size);
if (buffer == NULL) if (buffer == NULL)
return NULL; return NULL;
if (!_PyVerify_fd(fd)) if (!_PyVerify_fd(fd)) {
Py_DECREF(buffer);
return posix_error(); return posix_error();
}
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
n = read(fd, PyString_AsString(buffer), size); n = read(fd, PyString_AsString(buffer), size);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
@ -6600,12 +6602,14 @@ posix_write(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "is*:write", &fd, &pbuf)) if (!PyArg_ParseTuple(args, "is*:write", &fd, &pbuf))
return NULL; return NULL;
if (!_PyVerify_fd(fd)) if (!_PyVerify_fd(fd)) {
PyBuffer_Release(&pbuf);
return posix_error(); return posix_error();
}
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
size = write(fd, pbuf.buf, (size_t)pbuf.len); size = write(fd, pbuf.buf, (size_t)pbuf.len);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
PyBuffer_Release(&pbuf); PyBuffer_Release(&pbuf);
if (size < 0) if (size < 0)
return posix_error(); return posix_error();
return PyInt_FromSsize_t(size); return PyInt_FromSsize_t(size);
@ -7525,10 +7529,10 @@ posix_pathconf(PyObject *self, PyObject *args)
limit = pathconf(path, name); limit = pathconf(path, name);
if (limit == -1 && errno != 0) { if (limit == -1 && errno != 0) {
if (errno == EINVAL) if (errno == EINVAL)
/* could be a path or name problem */ /* could be a path or name problem */
posix_error(); posix_error();
else else
posix_error_with_filename(path); posix_error_with_filename(path);
} }
else else
result = PyInt_FromLong(limit); result = PyInt_FromLong(limit);