diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-17 12:19:45 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-17 12:19:45 (GMT) |
| commit | 1b64331f49881f23fbbdbab8a9e152aa2188d5b6 (patch) | |
| tree | a8bc538f6d46e6b7877141e1321ecc1c614616e9 | |
| parent | f3f5a1333be0623922798291286ae18c90617804 (diff) | |
| download | cpython-1b64331f49881f23fbbdbab8a9e152aa2188d5b6.zip cpython-1b64331f49881f23fbbdbab8a9e152aa2188d5b6.tar.gz cpython-1b64331f49881f23fbbdbab8a9e152aa2188d5b6.tar.bz2 | |
Merged revisions 77571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r77571 | antoine.pitrou | 2010-01-17 13:16:23 +0100 (dim., 17 janv. 2010) | 4 lines
Issue #7561: Fix crashes when using bytearray objects with the posix
module.
........
| -rw-r--r-- | Lib/test/test_os.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 62edd6c..907f943 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -564,6 +564,14 @@ class ExecTests(unittest.TestCase): def test_execvpe_with_bad_arglist(self): self.assertRaises(ValueError, os.execvpe, 'notepad', [], None) +class ArgTests(unittest.TestCase): + def test_bytearray(self): + # Issue #7561: posix module didn't release bytearray exports properly. + b = bytearray(os.sep.encode('ascii')) + self.assertRaises(OSError, os.mkdir, b) + # Check object is still resizable. + b[:] = b'' + class Win32ErrorTests(unittest.TestCase): def test_rename(self): self.assertRaises(WindowsError, os.rename, support.TESTFN, support.TESTFN+".bak") @@ -750,6 +758,7 @@ else: def test_main(): support.run_unittest( + ArgTests, FileTests, StatAttributeTests, EnvironTests, @@ -67,6 +67,9 @@ Core and Builtins Library ------- +- Issue #7561: Fix crashes when using bytearray objects with the posix + module. + - Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in multipart/signed MIME parts, which fixes one of the sources of invalid modifications to such parts by Generator. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 688da2c..814c9ba 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -580,7 +580,7 @@ static void release_bytes(PyObject* o) { if (PyByteArray_Check(o)) - o->ob_type->tp_as_buffer->bf_releasebuffer(NULL, 0); + o->ob_type->tp_as_buffer->bf_releasebuffer(o, 0); Py_DECREF(o); } |