libxml2-python: fix python3 malformed UTF8 strings

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2019-05-13 12:42:19 +02:00
parent 2727eda0e5
commit 884ef90219
No known key found for this signature in database
GPG key ID: DE55AD8DBEBB4EE8
2 changed files with 38 additions and 1 deletions

View file

@ -0,0 +1,37 @@
Description: work around libxml2 python3 handling of UTF-8 encoded messages
Author: Jan Matejek
Source: https://bugzilla.opensuse.org/show_bug.cgi?id=1065270
--- python/libxml.c
+++ 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);
}

View file

@ -1,7 +1,7 @@
# Template file for 'libxml2-python'
pkgname=libxml2-python
version=2.9.9
revision=2
revision=3
wrksrc="${pkgname%-python}-${version}"
build_wrksrc=python
build_style=python-module