From 1b64331f49881f23fbbdbab8a9e152aa2188d5b6 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 17 Jan 2010 12:19:45 +0000 Subject: [PATCH] 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. ........ --- Lib/test/test_os.py | 9 +++++++++ Misc/NEWS | 3 +++ Modules/posixmodule.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 62edd6c4fb..907f94312d 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, diff --git a/Misc/NEWS b/Misc/NEWS index e77e8a7432..c3a9f5c1dc 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 688da2c339..814c9bad1b 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); } -- 2.40.0