mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
PR: 234633 Obtained from: Fedora / openSuse
This commit is contained in:
parent
b8165b1aef
commit
89b855b456
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=495019
2 changed files with 36 additions and 1 deletions
35
textproc/libxml2/files/patch-python_libxml.c
Normal file
35
textproc/libxml2/files/patch-python_libxml.c
Normal file
|
@ -0,0 +1,35 @@
|
|||
# Workaround https://bugzilla.gnome.org/show_bug.cgi?id=789714
|
||||
# Obtained from openSuse / Fedora
|
||||
|
||||
--- python/libxml.c.orig 2016-06-07 10:04:14 UTC
|
||||
+++ 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);
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= textproc gnome python
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue