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);
     }
x/commit/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>commit</a><a href='/guix/diff/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/timezone.scm'>
<input type='hidden' name='id' value='006f9f0f21e12cdd29ae4758b778bb7ad831e291'/><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/commit/?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>root</a>/<a href='/guix/commit/gnu?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>gnu</a>/<a href='/guix/commit/gnu/installer?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>installer</a>/<a href='/guix/commit/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>timezone.scm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='006f9f0f21e12cdd29ae4758b778bb7ad831e291'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2023-11-14 20:11:47 +0100</td></tr>
<tr><th>committer</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2023-11-15 11:36:21 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>006f9f0f21e12cdd29ae4758b778bb7ad831e291</a> (<a href='/guix/patch/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>6ce3b0bbaa9b0cbc8ab091e4d536c399dc212eeb</a> /<a href='/guix/tree/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>gnu/installer/timezone.scm</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/installer/timezone.scm?id=aaee0e4af3809f8dbefb5d6efe251f0d73f8ed95'>aaee0e4af3809f8dbefb5d6efe251f0d73f8ed95</a> (<a href='/guix/diff/gnu/installer/timezone.scm?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291&amp;id2=aaee0e4af3809f8dbefb5d6efe251f0d73f8ed95'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-006f9f0f21e12cdd29ae4758b778bb7ad831e291.tar.gz'>guix-006f9f0f21e12cdd29ae4758b778bb7ad831e291.tar.gz</a><br/><a href='/guix/snapshot/guix-006f9f0f21e12cdd29ae4758b778bb7ad831e291.zip'>guix-006f9f0f21e12cdd29ae4758b778bb7ad831e291.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: spindle: Fix compilation with GCC 11.</div><div class='commit-msg'>* gnu/packages/admin.scm (spindle)[arguments]: Add CXXFLAGS
to #:configure-flags.

Change-Id: I660228b8839a524791273f3fc7b6935d704b6715
</div><div class='diffstat-header'><a href='/guix/diff/?id=006f9f0f21e12cdd29ae4758b778bb7ad831e291'>Diffstat</a> (limited to 'gnu/installer/timezone.scm')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>