From 6430fd56b4da63339c7238a75e5e014b95b39983 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 29 Sep 2011 04:02:13 +0200 Subject: [PATCH] Fix hex_digit_to_int() prototype: expect Py_UCS4, not Py_UNICODE --- Objects/bytearrayobject.c | 4 ++-- Objects/bytesobject.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index d294cd67b1d..72e581552a5 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1147,7 +1147,7 @@ PyDoc_STRVAR(clear__doc__, \n\ Remove all items from B."); -static PyObject * +static PyObject * bytearray_clear(PyByteArrayObject *self) { 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')."); static int -hex_digit_to_int(Py_UNICODE c) +hex_digit_to_int(Py_UCS4 c) { if (c >= 128) return -1; diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index b77d693fac8..fa0e8c2c999 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -593,7 +593,7 @@ PyBytes_Repr(PyObject *obj, int smartquotes) quote = '"'; if (squotes && quote == '\'') newsize += squotes; - + if (newsize > (PY_SSIZE_T_MAX - sizeof(PyUnicodeObject) - 1)) { PyErr_SetString(PyExc_OverflowError, "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'."); static int -hex_digit_to_int(Py_UNICODE c) +hex_digit_to_int(Py_UCS4 c) { if (c >= 128) return -1;