From 4cfb42dd2dc804600e9c1b33425f4a6095c46752 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Tue, 30 Aug 2011 21:40:20 +0200 Subject: [PATCH] Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to some functions like file.write(). --- Lib/ctypes/test/test_buffers.py | 4 ++++ Misc/NEWS | 3 +++ Modules/_ctypes/_ctypes.c | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Lib/ctypes/test/test_buffers.py b/Lib/ctypes/test/test_buffers.py index c19c05a300..2dc74841c4 100644 --- a/Lib/ctypes/test/test_buffers.py +++ b/Lib/ctypes/test/test_buffers.py @@ -20,6 +20,10 @@ class StringBufferTestCase(unittest.TestCase): self.assertEqual(b[::2], b"ac") self.assertEqual(b[::5], b"a") + def test_buffer_interface(self): + self.assertEqual(len(bytearray(create_string_buffer(0))), 0) + self.assertEqual(len(bytearray(create_string_buffer(1))), 1) + try: c_wchar except NameError: diff --git a/Misc/NEWS b/Misc/NEWS index 86eea69a3f..af26b8dcfa 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -152,6 +152,9 @@ Library Extension Modules ----------------- +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + - Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper signature. Without this, architectures where sizeof void* != sizeof int are broken. Patch given by Hallvard B Furuseth. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 8e8598002d..277206c7de 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2488,8 +2488,10 @@ static int PyCData_NewGetBuffer(PyObject *_self, Py_buffer *view, int flags) view->ndim = dict->ndim; view->shape = dict->shape; view->itemsize = self->b_size; - for (i = 0; i < view->ndim; ++i) { - view->itemsize /= dict->shape[i]; + if (view->itemsize) { + for (i = 0; i < view->ndim; ++i) { + view->itemsize /= dict->shape[i]; + } } view->strides = NULL; view->suboffsets = NULL; -- 2.40.0