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