This patch fixes a crash in the libxml2 bindings for Python 3.x
that 'itstool' stumbles upon when processing UTF-8 data:

  https://issues.guix.gnu.org/issue/37468

Patch by Jan Matejek
from <https://bugzilla.opensuse.org/show_bug.cgi?id=1065270>.

--- libxml2-2.9.5.orig/python/libxml.c
+++ libxml2-2.9.5/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);
     }
87d28457acc6cb790f4cbd7cc49b9'>tree</a><a href='/guix/commit/gnu/packages/patches/nvi-assume-preserve-path.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>commit</a><a href='/guix/diff/gnu/packages/patches/nvi-assume-preserve-path.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/nvi-assume-preserve-path.patch'>
<input type='hidden' name='id' value='820bf78cbc487d28457acc6cb790f4cbd7cc49b9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>root</a>/<a href='/guix/log/gnu?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>gnu</a>/<a href='/guix/log/gnu/packages?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>patches</a>/<a href='/guix/log/gnu/packages/patches/nvi-assume-preserve-path.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>nvi-assume-preserve-path.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/nvi-assume-preserve-path.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>