[Python-checkins] cpython (3.2): Issue #15732: Fix (constructed) crash in _PySequence_BytesToCharpArray().

Mon Aug 20 11:19:43 CEST 2012

http://hg.python.org/cpython/rev/cfddcf964ff0
changeset: 78667:cfddcf964ff0
branch: 3.2
parent: 78658:24b449a77e88
user: Stefan Krah <skrah at bytereef.org>
date: Mon Aug 20 11:04:24 2012 +0200
summary:
 Issue #15732: Fix (constructed) crash in _PySequence_BytesToCharpArray().
Found by Coverity.
files:
 Lib/test/test_capi.py | 13 +++++++++++++
 Objects/abstract.c | 5 +++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -11,6 +11,10 @@
 import unittest
 from test import support
 try:
+ import _posixsubprocess
+except ImportError:
+ _posixsubprocess = None
+try:
 import threading
 except ImportError:
 threading = None
@@ -55,6 +59,15 @@
 def test_memoryview_from_NULL_pointer(self):
 self.assertRaises(ValueError, _testcapi.make_memoryview_from_NULL_pointer)
 
+ @unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.')
+ def test_seq_bytes_to_charp_array(self):
+ # Issue #15732: crash in _PySequence_BytesToCharpArray()
+ class Z(object):
+ def __len__(self):
+ return 1
+ self.assertRaises(TypeError, _posixsubprocess.fork_exec,
+ 1,Z(),3,[1, 2],5,6,7,8,9,10,11,12,13,14,15,16,17)
+
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2736,6 +2736,11 @@
 for (i = 0; i < argc; ++i) {
 char *data;
 item = PySequence_GetItem(self, i);
+ if (item == NULL) {
+ /* NULL terminate before freeing. */
+ array[i] = NULL;
+ goto fail;
+ }
 data = PyBytes_AsString(item);
 if (data == NULL) {
 /* NULL terminate before freeing. */
-- 
Repository URL: http://hg.python.org/cpython
