From 219245203a3a6aad985048c36c8650e5b3ca518c Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Thu, 19 Feb 2004 16:37:07 +0000
Subject: [PATCH] fixed xmllint --memory --stream memory consumption on large
 file by using

* xmlreader.c: fixed xmllint --memory --stream memory consumption
  on large file by using xmlParserInputBufferCreateStatic() with
  the mmap'ed file
Daniel
---
 ChangeLog   |  6 ++++++
 xmlreader.c | 20 +++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5660b8b5..66c0d564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 19 17:33:36 CET 2004 Daniel Veillard <daniel@veillard.com>
+
+	* xmlreader.c: fixed xmllint --memory --stream memory consumption
+	  on large file by using xmlParserInputBufferCreateStatic() with
+	  the mmap'ed file 
+
 Thu Feb 19 13:56:53 CET 2004 Daniel Veillard <daniel@veillard.com>
 
 	* tree.c: some clarification in xmlDocDumpMemory() documentation
diff --git a/xmlreader.c b/xmlreader.c
index d190a699..e78b2865 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -792,9 +792,6 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) {
 		    if (inbuf->use == reader->cur) {
 			reader->mode = XML_TEXTREADER_MODE_EOF;
 			reader->state = oldstate;
-			if ((oldstate != XML_TEXTREADER_START) ||
-			    (reader->ctxt->myDoc != NULL))
-			    return(val);
 		    }
 		} else if (val < 0) {
 		    reader->mode = XML_TEXTREADER_MODE_EOF;
@@ -838,11 +835,13 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) {
      * Discard the consumed input when needed and possible
      */
     if (reader->mode == XML_TEXTREADER_MODE_INTERACTIVE) {
-	if ((reader->cur >= 4096) &&
-	    (inbuf->use - reader->cur <= CHUNK_SIZE)) {
-	    val = xmlBufferShrink(inbuf, reader->cur);
-	    if (val >= 0) {
-		reader->cur -= val;
+        if (inbuf->alloc != XML_BUFFER_ALLOC_IMMUTABLE) {
+	    if ((reader->cur >= 4096) &&
+		(inbuf->use - reader->cur <= CHUNK_SIZE)) {
+		val = xmlBufferShrink(inbuf, reader->cur);
+		if (val >= 0) {
+		    reader->cur -= val;
+		}
 	    }
 	}
     }
@@ -4377,8 +4376,7 @@ xmlReaderForMemory(const char *buffer, int size, const char *URL,
     xmlTextReaderPtr reader;
     xmlParserInputBufferPtr buf;
 
-    buf =
-        xmlParserInputBufferCreateMem(buffer, size,
+    buf = xmlParserInputBufferCreateStatic(buffer, size,
                                       XML_CHAR_ENCODING_NONE);
     if (buf == NULL) {
         return (NULL);
@@ -4599,7 +4597,7 @@ xmlReaderNewMemory(xmlTextReaderPtr reader, const char *buffer, int size,
     if (buffer == NULL)
         return (-1);
 
-    input = xmlParserInputBufferCreateMem(buffer, size,
+    input = xmlParserInputBufferCreateStatic(buffer, size,
                                       XML_CHAR_ENCODING_NONE);
     if (input == NULL) {
         return (-1);