|
|
|
|
diff -rupN --no-dereference libxml2-v2.9.13/python/libxml.c libxml2-v2.9.13-new/python/libxml.c
|
|
|
|
|
--- libxml2-v2.9.13/python/libxml.c 2022-02-19 19:26:42.000000000 +0100
|
|
|
|
|
+++ libxml2-v2.9.13-new/python/libxml.c 2022-05-03 11:40:49.210238037 +0200
|
|
|
|
|
@@ -1621,6 +1621,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);
|
|
|
|
|
@@ -1637,12 +1638,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);
|
|
|
|
|
}
|
