Array module's buffer interface can now handle empty arrays.

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index a8851804e422bb36cb195bd4da4356f6cbc9e0c4..f15ce09fb592c248b0e190b441c80c044489b115 100644 (file)
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -604,6 +604,13 @@ class ReTests(unittest.TestCase):
         self.assertEqual(iter.next().span(), (4, 4))
         self.assertRaises(StopIteration, iter.next)
 
+    def test_empty_array(self):
+        # SF buf 1647541
+        import array
+        for typecode in 'cbBuhHiIlLfd':
+            a = array.array(typecode)
+            self.assertEqual(re.compile("bla").match(a), None)
+            self.assertEqual(re.compile("").match(a).groups(), ())            
 
 def run_re_tests():
     from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR

diff --git a/Misc/NEWS b/Misc/NEWS
index 34d4d095b464d9c8c3fa689622c56a13a2c11579..641e0b0fba442a653c61388bd268a58a770b07c0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -134,6 +134,8 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Bug #1647541: Array module's buffer interface can now handle empty arrays.
+
 - Bug #1693079: The array module can now successfully pickle empty arrays.
 
 - Bug #1688393: Prevent crash in socket.recvfrom if length is negative.

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 0aeb64eeeee6d3056129e05e4ab66746432a8fa1..3ba5cf88e16c8d9f244664d9e4191221f608fb49 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1745,6 +1745,8 @@ static PyMappingMethods array_as_mapping = {
        (objobjargproc)array_ass_subscr
 };
 
+static const void *emptybuf = "";
+
 static Py_ssize_t
 array_buffer_getreadbuf(arrayobject *self, Py_ssize_t index, const void **ptr)
 {
@@ -1754,6 +1756,8 @@ array_buffer_getreadbuf(arrayobject *self, Py_ssize_t index, const void **ptr)
                return -1;
        }
        *ptr = (void *)self->ob_item;
+       if (*ptr == NULL)
+               *ptr = emptybuf;
        return self->ob_size*self->ob_descr->itemsize;
 }
 
@@ -1766,6 +1770,8 @@ array_buffer_getwritebuf(arrayobject *self, Py_ssize_t index, const void **ptr)
                return -1;
        }
        *ptr = (void *)self->ob_item;
+       if (*ptr == NULL)
+               *ptr = emptybuf;
        return self->ob_size*self->ob_descr->itemsize;
 }