[Python-checkins] bpo-31106: Fix handling of erros in posix_fallocate() and posix_fadvise() (#3000) (#3000)

Mon Aug 14 09:55:20 EDT 2017

https://github.com/python/cpython/commit/d4b93e21c2664d6a78e0656e7a7be0807be1c352
commit: d4b93e21c2664d6a78e0656e7a7be0807be1c352
branch: master
author: Коренберг Марк <socketpair at gmail.com>
committer: larryhastings <larry at hastings.org>
date: 2017年08月14日T06:55:16-07:00
summary:
bpo-31106: Fix handling of erros in posix_fallocate() and posix_fadvise() (#3000) (#3000)
files:
M Lib/test/test_posix.py
M Modules/posixmodule.c

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 148c0641a99..dba50e02d94 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -298,6 +298,16 @@ def test_posix_fallocate(self):
 finally:
 os.close(fd)
 
+ # issue31106 - posix_fallocate() does not set error in errno.
+ @unittest.skipUnless(hasattr(posix, 'posix_fallocate'),
+ "test needs posix.posix_fallocate()")
+ def test_posix_fallocate_errno(self):
+ try:
+ posix.posix_fallocate(-42, 0, 10)
+ except OSError as inst:
+ if inst.errno != errno.EBADF:
+ raise
+
 @unittest.skipUnless(hasattr(posix, 'posix_fadvise'),
 "test needs posix.posix_fadvise()")
 def test_posix_fadvise(self):
@@ -307,6 +317,15 @@ def test_posix_fadvise(self):
 finally:
 os.close(fd)
 
+ @unittest.skipUnless(hasattr(posix, 'posix_fadvise'),
+ "test needs posix.posix_fadvise()")
+ def test_posix_fadvise_errno(self):
+ try:
+ posix.posix_fadvise(-42, 0, 0, posix.POSIX_FADV_WILLNEED)
+ except OSError as inst:
+ if inst.errno != errno.EBADF:
+ raise
+
 @unittest.skipUnless(os.utime in os.supports_fd, "test needs fd support in os.utime")
 def test_utime_with_fd(self):
 now = time.time()
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 2e5e79a8d36..f0577874334 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -8917,11 +8917,16 @@ os_posix_fallocate_impl(PyObject *module, int fd, Py_off_t offset,
 Py_BEGIN_ALLOW_THREADS
 result = posix_fallocate(fd, offset, length);
 Py_END_ALLOW_THREADS
- } while (result != 0 && errno == EINTR &&
- !(async_err = PyErr_CheckSignals()));
- if (result != 0)
- return (!async_err) ? posix_error() : NULL;
- Py_RETURN_NONE;
+ } while (result == EINTR && !(async_err = PyErr_CheckSignals()));
+
+ if (result == 0)
+ Py_RETURN_NONE;
+
+ if (async_err)
+ return NULL;
+
+ errno = result;
+ return posix_error();
 }
 #endif /* HAVE_POSIX_FALLOCATE) && !POSIX_FADVISE_AIX_BUG */
 
@@ -8959,11 +8964,16 @@ os_posix_fadvise_impl(PyObject *module, int fd, Py_off_t offset,
 Py_BEGIN_ALLOW_THREADS
 result = posix_fadvise(fd, offset, length, advice);
 Py_END_ALLOW_THREADS
- } while (result != 0 && errno == EINTR &&
- !(async_err = PyErr_CheckSignals()));
- if (result != 0)
- return (!async_err) ? posix_error() : NULL;
- Py_RETURN_NONE;
+ } while (result == EINTR && !(async_err = PyErr_CheckSignals()));
+
+ if (result == 0)
+ Py_RETURN_NONE;
+
+ if (async_err)
+ return NULL;
+
+ errno = result;
+ return posix_error();
 }
 #endif /* HAVE_POSIX_FADVISE && !POSIX_FADVISE_AIX_BUG */
 
