commit ccc4d2b62ef2ae474b68168135cfbff47c499727
author Daniel Veillard <veillard@src.gnome.org> Wed Sep 17 21:27:31 2003 +0000
committer Daniel Veillard <veillard@src.gnome.org> Wed Sep 17 21:27:31 2003 +0000
tree 3ed3b71101563c9a99064f655fc35fb8db973c07
parent a66b1d1a7da999bde410c8674bf03887f0bc6509

two small improvements Daniel

* dict.c xmlreader.c: two small improvements
Daniel

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 444cbf7..6dfcaf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 17 23:25:47 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* dict.c xmlreader.c: two small improvements
+
 Wed Sep 17 22:53:32 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* parserInternals.c: avoid a leak with previous patch

dict.c

diff --git a/dict.c b/dict.c
index 20d1efb..24879e9 100644
--- a/dict.c
+++ b/dict.c
@@ -338,6 +338,9 @@
     if ((dict == NULL) || (name == NULL))
 	return(NULL);
 
+    if ((name[len] == 0) && (xmlDictOwns(dict, name) == 1))
+        return(name);
+        
     if (len < 0)
         len = xmlStrlen(name);
 

xmlreader.c

diff --git a/xmlreader.c b/xmlreader.c
index eb8e6a2..30451b4 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1272,6 +1272,7 @@
      * If we are in the middle of a piece of CDATA make sure it's finished
      */
     if ((reader->node != NULL) &&
+        (reader->node->next == NULL) &&
         ((reader->node->type == XML_TEXT_NODE) ||
 	 (reader->node->type == XML_CDATA_SECTION_NODE))) {
             xmlTextReaderExpand(reader);