| https://bugs.gentoo.org/745162 |
| --- a/python/libxml.c |
| +++ b/python/libxml.c |
| @@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU |
| PyObject *message; |
| PyObject *result; |
| char str[1000]; |
| + unsigned char *ptr = (unsigned char *)str; |
| |
| #ifdef DEBUG_ERROR |
| printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); |
| @@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU |
| str[999] = 0; |
| va_end(ap); |
| |
| +#if PY_MAJOR_VERSION >= 3 |
| + /* Ensure the error string doesn't start at UTF8 continuation. */ |
| + while (*ptr && (*ptr & 0xc0) == 0x80) |
| + ptr++; |
| +#endif |
| + |
| list = PyTuple_New(2); |
| PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); |
| Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); |
| - message = libxml_charPtrConstWrap(str); |
| + message = libxml_charPtrConstWrap(ptr); |
| PyTuple_SetItem(list, 1, message); |
| result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); |
| + /* Forget any errors caused in the error handler. */ |
| + PyErr_Clear(); |
| Py_XDECREF(list); |
| Py_XDECREF(result); |
| } |
