[Bug 22140] libxml2: 2.6.23-1 breaks xsltproc

[bugzilla-daemon at bugzilla.ubuntu.com]

Please do not reply to this email.  You can add comments at
http://bugzilla.ubuntu.com/show_bug.cgi?id=22140
Ubuntu | libxml2





------- Additional Comments From debzilla at ubuntu.com  2006-01-12 16:48 UTC -------
Message-ID: <43C67B2D.2050303 at debian.org>
Date: Thu, 12 Jan 2006 16:52:13 +0100
From: Luk Claes <luk at debian.org>
To: 346594 at bugs.debian.org
Subject: Patch of NMU of libxml2

--------------enigCD60EC7150A99C6FA22526BD
Content-Type: multipart/mixed;
 boundary="------------070801090600030102070407"

This is a multi-part message in MIME format.
--------------070801090600030102070407
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Hi

Attached the patch for the version I uploaded. Sorry, I forget to send
it beforehand, though it actually contains just the upstream cvs patch
which is already referred to in the bug log.

Cheers

Luk

-- 
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint:   D5AF 25FB 316B 53BB 08E7   F999 E544 DE07 9B7C 328D

--------------070801090600030102070407
Content-Type: text/plain;
 name="nmu.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="nmu.patch"

diff -u libxml2-2.6.23/debian/changelog libxml2-2.6.23/debian/changelog
--- libxml2-2.6.23/debian/changelog
+++ libxml2-2.6.23/debian/changelog
@@ -1,3 +1,10 @@
+libxml2 (2.6.23-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix XML parser to unbreak xsltproc (Closes: #346594).
+
+ -- Luk Claes <luk at debian.org>  Thu, 12 Jan 2006 15:25:42 +0100
+
 libxml2 (2.6.23-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- libxml2-2.6.23.orig/parser.c
+++ libxml2-2.6.23/parser.c
@@ -3539,16 +3539,12 @@
 	    ctxt->input->cur = in;
 	    if (*in == 0xD) {
 		in++;
-		if (!*in)	/* if end of current chunk return */
-		    return;
 		if (*in == 0xA) {
 		    ctxt->input->cur = in;
 		    in++;
 		    ctxt->input->line++; ctxt->input->col = 1;
 		    continue; /* while */
 		}
-		if (!*in)	/* if end of current chunk return */
-		    return;
 		in--;
 	    }
 	    if (*in == '<') {
@@ -3931,8 +3927,6 @@
 		ctxt->input->line++; ctxt->input->col = 1;
 		continue; /* while */
 	    }
-	    if (!*in)	/* if end of current chunk return */
-		return;
 	    in--;
 	}
 	SHRINK;
@@ -10407,12 +10401,19 @@
 int
 xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
               int terminate) {
+    int end_in_lf = 0;
+    
     if (ctxt == NULL)
         return(XML_ERR_INTERNAL_ERROR);
     if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
         return(ctxt->errNo);
     if (ctxt->instate == XML_PARSER_START)
         xmlDetectSAX2(ctxt);
+    if ((size > 0) && (chunk != NULL) && (!terminate) &&
+          (chunk[size - 1] == '\r')) {
+        end_in_lf = 1;
+	size--;
+    }
     if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) &&
         (ctxt->input->buf != NULL) && (ctxt->instate != XML_PARSER_EOF))  {
 	int base = ctxt->input->base - ctxt->input->buf->buffer->content;
@@ -10451,6 +10452,10 @@
 	}
     }
     xmlParseTryOrFinish(ctxt, terminate);
+    if ((end_in_lf == 1) && (ctxt->input != NULL) &&
+          (ctxt->input->buf != NULL)) {
+        xmlParserInputBufferPush(ctxt->input->buf, 1, "\r");
+    }
     if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
         return(ctxt->errNo);
     if (terminate) {

--------------070801090600030102070407--

--------------enigCD60EC7150A99C6FA22526BD
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDxnst5UTeB5t8Mo0RAvrOAJ91+KamrhIknEBcUZk4SIM5/dmlBwCfcFrI
+6GRuLKOjvgZfib+KsqeG64=
=tbUW
-----END PGP SIGNATURE-----

--------------enigCD60EC7150A99C6FA22526BD--

-- 
Configure bugmail: http://bugzilla.ubuntu.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug, or are watching the QA contact.