Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #20142: Py_buffer variables generated by Argument Clinic are now 

initialized with a default value.
This commit is contained in:
Larry Hastings 2014-01-06 10:34:00 -08:00
parent b7f5dcadf2
commit 3f144c2ad7
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Misc/NEWS
View File

@ -13,6 +13,11 @@ Core and Builtins
Library Library
------- -------
Tools/Demos
-----------
- Issue #20142: Py_buffer variables generated by Argument Clinic are now
initialized with a default value.
What's New in Python 3.4.0 Beta 2? What's New in Python 3.4.0 Beta 2?
================================== ==================================

8
Modules/zlibmodule.c
View File

@ -198,7 +198,7 @@ static PyObject *
zlib_compress(PyModuleDef *module, PyObject *args) zlib_compress(PyModuleDef *module, PyObject *args)
{ {
PyObject *return_value = NULL; PyObject *return_value = NULL;
Py_buffer bytes; Py_buffer bytes = {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL};
int group_right_1 = 0; int group_right_1 = 0;
int level = 0; int level = 0;
@ -227,7 +227,7 @@ zlib_compress(PyModuleDef *module, PyObject *args)
static PyObject * static PyObject *
zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int group_right_1, int level) zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int group_right_1, int level)
/*[clinic checksum: f490708eff84be652b5ebe7fe622ab73ac12c888]*/ /*[clinic checksum: 9f055a396620bc1a8a13d74c3496249528b32b0d]*/
{ {
PyObject *ReturnVal = NULL; PyObject *ReturnVal = NULL;
Byte *input, *output = NULL; Byte *input, *output = NULL;
@ -789,7 +789,7 @@ static PyObject *
zlib_Decompress_decompress(PyObject *self, PyObject *args) zlib_Decompress_decompress(PyObject *self, PyObject *args)
{ {
PyObject *return_value = NULL; PyObject *return_value = NULL;
Py_buffer data; Py_buffer data = {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL};
unsigned int max_length = 0; unsigned int max_length = 0;
if (!PyArg_ParseTuple(args, if (!PyArg_ParseTuple(args,
@ -808,7 +808,7 @@ exit:
static PyObject * static PyObject *
zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, unsigned int max_length) zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, unsigned int max_length)
/*[clinic checksum: 3599698948f5a712f5a8309491671cc2ce969d2c]*/ /*[clinic checksum: 5b1e4f9f1ef8eca55fff78356f9df0c81232ed3b]*/
{ {
int err; int err;
unsigned int old_length, length = DEFAULTALLOC; unsigned int old_length, length = DEFAULTALLOC;

10
Tools/clinic/clinic.py
View File

@ -1488,7 +1488,12 @@ class CConverter(metaclass=CConverterAutoRegister):
declaration.append('\nPy_ssize_clean_t ') declaration.append('\nPy_ssize_clean_t ')
declaration.append(self.length_name()) declaration.append(self.length_name())
declaration.append(';') declaration.append(';')
return "".join(declaration) s = "".join(declaration)
# double up curly-braces, this string will be used
# as part of a format_map() template later
s = s.replace("{", "{{")
s = s.replace("}", "}}")
return s
def initialize(self): def initialize(self):
""" """
@ -1742,6 +1747,9 @@ class Py_buffer_converter(CConverter):
c_ignored_default = "{NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL}" c_ignored_default = "{NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL}"
def converter_init(self, *, types='bytes bytearray buffer', nullable=False): def converter_init(self, *, types='bytes bytearray buffer', nullable=False):
if self.default != unspecified:
fail("There is no legal default value for Py_buffer ")
self.c_default = self.c_ignored_default
types = set(types.strip().split()) types = set(types.strip().split())
bytes_type = set(('bytes',)) bytes_type = set(('bytes',))
bytearray_type = set(('bytearray',)) bytearray_type = set(('bytearray',))