mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Fix hex_digit_to_int() prototype: expect Py_UCS4, not Py_UNICODE

Browse source
This commit is contained in:
Victor Stinner 2011-09-29 04:02:13 +02:00
parent d9c563e84d
commit 6430fd56b4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/bytearrayobject.c
View file

@ -1147,7 +1147,7 @@ PyDoc_STRVAR(clear__doc__,
\n\ \n\
Remove all items from B."); Remove all items from B.");
static PyObject * static PyObject *
bytearray_clear(PyByteArrayObject *self) bytearray_clear(PyByteArrayObject *self)
{ {
if (PyByteArray_Resize((PyObject *)self, 0) < 0) if (PyByteArray_Resize((PyObject *)self, 0) < 0)
@ -2629,7 +2629,7 @@ Spaces between two numbers are accepted.\n\
Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef')."); Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef').");
static int static int
hex_digit_to_int(Py_UNICODE c) hex_digit_to_int(Py_UCS4 c)
{ {
if (c >= 128) if (c >= 128)
return -1; return -1;

4
Objects/bytesobject.c
View file

@ -593,7 +593,7 @@ PyBytes_Repr(PyObject *obj, int smartquotes)
quote = '"'; quote = '"';
if (squotes && quote == '\'') if (squotes && quote == '\'')
newsize += squotes; newsize += squotes;
if (newsize > (PY_SSIZE_T_MAX - sizeof(PyUnicodeObject) - 1)) { if (newsize > (PY_SSIZE_T_MAX - sizeof(PyUnicodeObject) - 1)) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"bytes object is too large to make repr"); "bytes object is too large to make repr");
@ -2330,7 +2330,7 @@ Spaces between two numbers are accepted.\n\
Example: bytes.fromhex('B9 01EF') -> b'\\xb9\\x01\\xef'."); Example: bytes.fromhex('B9 01EF') -> b'\\xb9\\x01\\xef'.");
static int static int
hex_digit_to_int(Py_UNICODE c) hex_digit_to_int(Py_UCS4 c)
{ {
if (c >= 128) if (c >= 128)
return -1; return -1;