mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 23:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #24102: Fixed exception type checking in standard error handlers.

Browse source
This commit is contained in:
Serhiy Storchaka 2015-05-18 16:10:40 +03:00
commit c0937f79ec
3 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/test_codeccallbacks.py
View file

@ -1046,6 +1046,30 @@ class CodecCallbackTest(unittest.TestCase):
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
data.decode(encoding, "test.replacing") data.decode(encoding, "test.replacing")
def test_fake_error_class(self):
handlers = [
codecs.strict_errors,
codecs.ignore_errors,
codecs.replace_errors,
codecs.backslashreplace_errors,
codecs.namereplace_errors,
codecs.xmlcharrefreplace_errors,
codecs.lookup_error('surrogateescape'),
codecs.lookup_error('surrogatepass'),
]
for cls in UnicodeEncodeError, UnicodeDecodeError, UnicodeTranslateError:
class FakeUnicodeError(str):
__class__ = cls
for handler in handlers:
with self.subTest(handler=handler, error_class=cls):
self.assertRaises(TypeError, handler, FakeUnicodeError())
class FakeUnicodeError(Exception):
__class__ = cls
for handler in handlers:
with self.subTest(handler=handler, error_class=cls):
with self.assertRaises((TypeError, FakeUnicodeError)):
handler(FakeUnicodeError())
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()

2
Misc/NEWS
View file

@ -10,6 +10,8 @@ Release date: 2015-05-24
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #24102: Fixed exception type checking in standard error handlers.
- Issue #15027: The UTF-32 encoder is now 3x to 7x faster. - Issue #15027: The UTF-32 encoder is now 3x to 7x faster.
- Issue #23290: Optimize set_merge() for cases where the target is empty. - Issue #23290: Optimize set_merge() for cases where the target is empty.

46
Python/codecs.c
View file

@ -662,18 +662,9 @@ PyObject *PyCodec_LookupError(const char *name)
static void wrong_exception_type(PyObject *exc) static void wrong_exception_type(PyObject *exc)
{ {
_Py_IDENTIFIER(__class__);
_Py_IDENTIFIER(__name__);
PyObject *type = _PyObject_GetAttrId(exc, &PyId___class__);
if (type != NULL) {
PyObject *name = _PyObject_GetAttrId(type, &PyId___name__);
Py_DECREF(type);
if (name != NULL) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"don't know how to handle %S in error callback", name); "don't know how to handle %.200s in error callback",
Py_DECREF(name); exc->ob_type->tp_name);
}
}
} }
PyObject *PyCodec_StrictErrors(PyObject *exc) PyObject *PyCodec_StrictErrors(PyObject *exc)
@ -689,15 +680,16 @@ PyObject *PyCodec_StrictErrors(PyObject *exc)
PyObject *PyCodec_IgnoreErrors(PyObject *exc) PyObject *PyCodec_IgnoreErrors(PyObject *exc)
{ {
Py_ssize_t end; Py_ssize_t end;
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
if (PyUnicodeEncodeError_GetEnd(exc, &end)) if (PyUnicodeEncodeError_GetEnd(exc, &end))
return NULL; return NULL;
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
if (PyUnicodeDecodeError_GetEnd(exc, &end)) if (PyUnicodeDecodeError_GetEnd(exc, &end))
return NULL; return NULL;
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)) {
if (PyUnicodeTranslateError_GetEnd(exc, &end)) if (PyUnicodeTranslateError_GetEnd(exc, &end))
return NULL; return NULL;
} }
@ -713,7 +705,7 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc)
{ {
Py_ssize_t start, end, i, len; Py_ssize_t start, end, i, len;
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
PyObject *res; PyObject *res;
int kind; int kind;
void *data; void *data;
@ -732,14 +724,14 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc)
assert(_PyUnicode_CheckConsistency(res, 1)); assert(_PyUnicode_CheckConsistency(res, 1));
return Py_BuildValue("(Nn)", res, end); return Py_BuildValue("(Nn)", res, end);
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
if (PyUnicodeDecodeError_GetEnd(exc, &end)) if (PyUnicodeDecodeError_GetEnd(exc, &end))
return NULL; return NULL;
return Py_BuildValue("(Cn)", return Py_BuildValue("(Cn)",
(int)Py_UNICODE_REPLACEMENT_CHARACTER, (int)Py_UNICODE_REPLACEMENT_CHARACTER,
end); end);
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)) {
PyObject *res; PyObject *res;
int kind; int kind;
void *data; void *data;
@ -766,7 +758,7 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc)
PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc) PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
{ {
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
PyObject *restuple; PyObject *restuple;
PyObject *object; PyObject *object;
Py_ssize_t i; Py_ssize_t i;
@ -873,7 +865,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
int ressize; int ressize;
Py_UCS4 c; Py_UCS4 c;
if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
unsigned char *p; unsigned char *p;
if (PyUnicodeDecodeError_GetStart(exc, &start)) if (PyUnicodeDecodeError_GetStart(exc, &start))
return NULL; return NULL;
@ -903,7 +895,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
Py_DECREF(object); Py_DECREF(object);
return Py_BuildValue("(Nn)", res, end); return Py_BuildValue("(Nn)", res, end);
} }
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
if (PyUnicodeEncodeError_GetStart(exc, &start)) if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL; return NULL;
if (PyUnicodeEncodeError_GetEnd(exc, &end)) if (PyUnicodeEncodeError_GetEnd(exc, &end))
@ -911,7 +903,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
if (!(object = PyUnicodeEncodeError_GetObject(exc))) if (!(object = PyUnicodeEncodeError_GetObject(exc)))
return NULL; return NULL;
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)) {
if (PyUnicodeTranslateError_GetStart(exc, &start)) if (PyUnicodeTranslateError_GetStart(exc, &start))
return NULL; return NULL;
if (PyUnicodeTranslateError_GetEnd(exc, &end)) if (PyUnicodeTranslateError_GetEnd(exc, &end))
@ -977,7 +969,7 @@ static int ucnhash_initialized = 0;
PyObject *PyCodec_NameReplaceErrors(PyObject *exc) PyObject *PyCodec_NameReplaceErrors(PyObject *exc)
{ {
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
PyObject *restuple; PyObject *restuple;
PyObject *object; PyObject *object;
Py_ssize_t i; Py_ssize_t i;
@ -1150,7 +1142,8 @@ PyCodec_SurrogatePassErrors(PyObject *exc)
Py_ssize_t start; Py_ssize_t start;
Py_ssize_t end; Py_ssize_t end;
PyObject *res; PyObject *res;
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
unsigned char *outp; unsigned char *outp;
if (PyUnicodeEncodeError_GetStart(exc, &start)) if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL; return NULL;
@ -1227,7 +1220,7 @@ PyCodec_SurrogatePassErrors(PyObject *exc)
Py_DECREF(object); Py_DECREF(object);
return restuple; return restuple;
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
unsigned char *p; unsigned char *p;
Py_UCS4 ch = 0; Py_UCS4 ch = 0;
if (PyUnicodeDecodeError_GetStart(exc, &start)) if (PyUnicodeDecodeError_GetStart(exc, &start))
@ -1312,7 +1305,8 @@ PyCodec_SurrogateEscapeErrors(PyObject *exc)
Py_ssize_t start; Py_ssize_t start;
Py_ssize_t end; Py_ssize_t end;
PyObject *res; PyObject *res;
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
char *outp; char *outp;
if (PyUnicodeEncodeError_GetStart(exc, &start)) if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL; return NULL;
@ -1343,7 +1337,7 @@ PyCodec_SurrogateEscapeErrors(PyObject *exc)
Py_DECREF(object); Py_DECREF(object);
return restuple; return restuple;
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
PyObject *str; PyObject *str;
unsigned char *p; unsigned char *p;
Py_UCS2 ch[4]; /* decode up to 4 bad bytes. */ Py_UCS2 ch[4]; /* decode up to 4 bad bytes. */