mirror of
https://github.com/python/cpython.git
synced 2025-08-22 17:55:18 +00:00
Array module's buffer interface can now handle empty arrays.
This commit is contained in:
parent
4bbcb64d5d
commit
d6030acd7f
3 changed files with 15 additions and 0 deletions
|
@ -604,6 +604,13 @@ class ReTests(unittest.TestCase):
|
||||||
self.assertEqual(iter.next().span(), (4, 4))
|
self.assertEqual(iter.next().span(), (4, 4))
|
||||||
self.assertRaises(StopIteration, iter.next)
|
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():
|
def run_re_tests():
|
||||||
from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR
|
from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR
|
||||||
|
|
|
@ -134,6 +134,8 @@ Core and builtins
|
||||||
Extension Modules
|
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 #1693079: The array module can now successfully pickle empty arrays.
|
||||||
|
|
||||||
- Bug #1688393: Prevent crash in socket.recvfrom if length is negative.
|
- Bug #1688393: Prevent crash in socket.recvfrom if length is negative.
|
||||||
|
|
|
@ -1745,6 +1745,8 @@ static PyMappingMethods array_as_mapping = {
|
||||||
(objobjargproc)array_ass_subscr
|
(objobjargproc)array_ass_subscr
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const void *emptybuf = "";
|
||||||
|
|
||||||
static Py_ssize_t
|
static Py_ssize_t
|
||||||
array_buffer_getreadbuf(arrayobject *self, Py_ssize_t index, const void **ptr)
|
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;
|
return -1;
|
||||||
}
|
}
|
||||||
*ptr = (void *)self->ob_item;
|
*ptr = (void *)self->ob_item;
|
||||||
|
if (*ptr == NULL)
|
||||||
|
*ptr = emptybuf;
|
||||||
return self->ob_size*self->ob_descr->itemsize;
|
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;
|
return -1;
|
||||||
}
|
}
|
||||||
*ptr = (void *)self->ob_item;
|
*ptr = (void *)self->ob_item;
|
||||||
|
if (*ptr == NULL)
|
||||||
|
*ptr = emptybuf;
|
||||||
return self->ob_size*self->ob_descr->itemsize;
|
return self->ob_size*self->ob_descr->itemsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue