Attachment #533622 for bug #656728




https://gitlab.gnome.org/GNOME/libxml2/commit/7a1bd7f6497ac33a9023d556f6f47a48f01deac0

--- /HTMLparser.c
+++ /HTMLparser.c
@@ -3635,7 +3635,7 @@
 	     */
 	    processed = ctxt->input->cur - ctxt->input->base;
 	    xmlBufShrink(ctxt->input->buf->buffer, processed);
-	    nbchars = xmlCharEncInput(ctxt->input->buf, 0);
+	    nbchars = xmlCharEncInput(ctxt->input->buf, 1);
 	    if (nbchars < 0) {
 		htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
 		             "htmlCheckEncoding: encoder error\n",
--- /parserInternals.c
+++ /parserInternals.c
@@ -1214,7 +1214,7 @@
                 /*
                  * convert as much as possible of the buffer
                  */
-                nbchars = xmlCharEncInput(input->buf, 0);
+                nbchars = xmlCharEncInput(input->buf, 1);
             } else {
                 /*
                  * convert just enough to get
--- /xmlIO.c
+++ /xmlIO.c
@@ -3157,7 +3157,7 @@
 	 * convert as much as possible to the parser reading buffer.
 	 */
 	use = xmlBufUse(in->raw);
-	nbchars = xmlCharEncInput(in, 0);
+	nbchars = xmlCharEncInput(in, 1);
 	if (nbchars < 0) {
 	    xmlIOErr(XML_IO_ENCODER, NULL);
 	    in->error = XML_IO_ENCODER;
@@ -3273,7 +3273,7 @@
 	 * convert as much as possible to the parser reading buffer.
 	 */
 	use = xmlBufUse(in->raw);
-	nbchars = xmlCharEncInput(in, 0);
+	nbchars = xmlCharEncInput(in, 1);
 	if (nbchars < 0) {
 	    xmlIOErr(XML_IO_ENCODER, NULL);
 	    in->error = XML_IO_ENCODER;

Lines 76-81 src_prepare() { Link Here

(-)a/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild (-1 / +3 lines)
76		76
77	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c	77	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
78		78
		79	# Fix decoding of larger documents with ICU.
		80	eapply "${FILESDIR}"/${P}-larger_documents_decoding.patch
		81
79	# Fix python detection, bug #567066	82	# Fix python detection, bug #567066
80	# https://bugzilla.gnome.org/show_bug.cgi?id=760458	83	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
81	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch	84	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
82	-

Return to bug 656728

Line 0 Link Here

(-)a/dev-libs/libxml2/files/libxml2-2.9.8-larger_documents_decoding.patch (+44 lines)
	1	https://gitlab.gnome.org/GNOME/libxml2/commit/7a1bd7f6497ac33a9023d556f6f47a48f01deac0
	2
	3	--- /HTMLparser.c
	4	+++ /HTMLparser.c
	5	@@ -3635,7 +3635,7 @@
	6	*/
	7	processed = ctxt->input->cur - ctxt->input->base;
	8	xmlBufShrink(ctxt->input->buf->buffer, processed);
	9	- nbchars = xmlCharEncInput(ctxt->input->buf, 0);
	10	+ nbchars = xmlCharEncInput(ctxt->input->buf, 1);
	11	if (nbchars < 0) {
	12	htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
	13	"htmlCheckEncoding: encoder error\n",
	14	--- /parserInternals.c
	15	+++ /parserInternals.c
	16	@@ -1214,7 +1214,7 @@
	17	/*
	18	* convert as much as possible of the buffer
	19	*/
	20	- nbchars = xmlCharEncInput(input->buf, 0);
	21	+ nbchars = xmlCharEncInput(input->buf, 1);
	22	} else {
	23	/*
	24	* convert just enough to get
	25	--- /xmlIO.c
	26	+++ /xmlIO.c
	27	@@ -3157,7 +3157,7 @@
	28	* convert as much as possible to the parser reading buffer.
	29	*/
	30	use = xmlBufUse(in->raw);
	31	- nbchars = xmlCharEncInput(in, 0);
	32	+ nbchars = xmlCharEncInput(in, 1);
	33	if (nbchars < 0) {
	34	xmlIOErr(XML_IO_ENCODER, NULL);
	35	in->error = XML_IO_ENCODER;
	36	@@ -3273,7 +3273,7 @@
	37	* convert as much as possible to the parser reading buffer.
	38	*/
	39	use = xmlBufUse(in->raw);
	40	- nbchars = xmlCharEncInput(in, 0);
	41	+ nbchars = xmlCharEncInput(in, 1);
	42	if (nbchars < 0) {
	43	xmlIOErr(XML_IO_ENCODER, NULL);
	44	in->error = XML_IO_ENCODER;