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 . --- 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); } rsion-control.scm?id=1859c94aa1ef05d325732197f764af6205efc137'>commitdiff
path: root/gnu/packages/version-control.scm
AgeCommit message (Expand)Author
2019-11-04gnu: git: Update to 2.24.0....* gnu/packages/version-control.scm (git): Update to 2.24.0. Tobias Geerinckx-Rice
2019-11-02gnu: git: Add PCRE support to "git grep"....* gnu/packages/version-control.scm (git)[inputs]: Add pcre2. [arguments]: Add "USE_LIBPCRE2" to make-flags. (git-minimal)[arguments]: Do not inherit "USE_LIBPCRE2" in make-flags. Pierre Neidhardt
2019-08-22Merge branch 'master' into core-updatesMark H Weaver
2019-08-17gnu: git: Update to 2.23.0....* gnu/packages/version-control.scm (git): Update to 2.23.0. Tobias Geerinckx-Rice
2019-08-13Merge branch 'master' into core-updatesMarius Bakke
2019-08-13Merge branch 'staging'Marius Bakke
2019-08-13gnu: git: Update to 2.22.1....* gnu/packages/version-control.scm (git): Update to 2.22.1. Tobias Geerinckx-Rice
2019-08-04gnu: subversion: Update to 1.10.6 [fixes CVE-2018-11782, CVE-2019-0203]....* gnu/packages/version-control.scm (subversion): Update to 1.10.6. Marius Bakke
2019-07-17Merge branch 'master' into core-updatesLudovic Courtès
2019-07-16gnu: mercurial: Update to 5.0.2....* gnu/packages/version-control.scm (mercurial): Update to 5.0.2. Tobias Geerinckx-Rice
2019-07-12Merge branch 'master' into core-updates... Conflicts: gnu/local.mk gnu/packages/python-xyz.scm gnu/packages/xml.scm guix/gexp.scm po/guix/POTFILES.in Marius Bakke
2019-07-10gnu: cvs: Rename patch file....* gnu/packages/version-control.scm (cvs)[source]: Rename patch. * gnu/packages/patches/cvs-2017-12836.patch: Rename to ... * gnu/packages/patches/cvs-CVE-2018-12836.patch: ... this. * gnu/local.mk (dist_patch_DATA): Register it. Efraim Flashner