forked from opnsense/ports
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
textproc/libxml2: sync with upstream
Taken from: HardenedBSD
- Loading branch information
Showing
1 changed file
with
35 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} |