mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Followup to #7703: a2b_hqx() didn't follow the new buffer API (neither in trunk

Browse source 
nor in py3k).  Patch by Florent Xicluna as well as additional tests.
This commit is contained in:
Antoine Pitrou 2010-01-16 17:45:56 +00:00
parent c755dba906
commit db983a7c38
2 changed files with 86 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/binascii.c
View file

@ -537,6 +537,7 @@ PyDoc_STRVAR(doc_a2b_hqx, "ascii -> bin, done. Decode .hqx coding");
static PyObject *
binascii_a2b_hqx(PyObject *self, PyObject *args)
{
Py_buffer pascii;
unsigned char *ascii_data, *bin_data;
int leftbits = 0;
unsigned char this_ch;
@ -545,19 +546,25 @@ binascii_a2b_hqx(PyObject *self, PyObject *args)
Py_ssize_t len;
int done = 0;
if ( !PyArg_ParseTuple(args, "t#:a2b_hqx", &ascii_data, &len) )
if ( !PyArg_ParseTuple(args, "s*:a2b_hqx", &pascii) )
return NULL;
ascii_data = pascii.buf;
len = pascii.len;
assert(len >= 0);
if (len > PY_SSIZE_T_MAX - 2)
if (len > PY_SSIZE_T_MAX - 2) {
PyBuffer_Release(&pascii);
return PyErr_NoMemory();
}
/* Allocate a string that is too big (fixed later)
Add two to the initial length to prevent interning which
would preclude subsequent resizing. */
if ( (rv=PyString_FromStringAndSize(NULL, len+2)) == NULL )
if ( (rv=PyString_FromStringAndSize(NULL, len+2)) == NULL ) {
PyBuffer_Release(&pascii);
return NULL;
}
bin_data = (unsigned char *)PyString_AS_STRING(rv);
for( ; len > 0 ; len--, ascii_data++ ) {
@ -567,6 +574,7 @@ binascii_a2b_hqx(PyObject *self, PyObject *args)
continue;
if ( this_ch == FAIL ) {
PyErr_SetString(Error, "Illegal char");
PyBuffer_Release(&pascii);
Py_DECREF(rv);
return NULL;
}
@ -589,6 +597,7 @@ binascii_a2b_hqx(PyObject *self, PyObject *args)
if ( leftbits && !done ) {
PyErr_SetString(Incomplete,
"String has incomplete number of bytes");
PyBuffer_Release(&pascii);
Py_DECREF(rv);
return NULL;
}
@ -600,10 +609,12 @@ binascii_a2b_hqx(PyObject *self, PyObject *args)
}
if (rv) {
PyObject *rrv = Py_BuildValue("Oi", rv, done);
PyBuffer_Release(&pascii);
Py_DECREF(rv);
return rrv;
}
PyBuffer_Release(&pascii);
return NULL;
}