fix a nasty bug introduced when cleaning up entities processing in 2.…

…7.x , * parser.c: fix a nasty bug introduced when cleaning up entities processing in 2.7.x , fixes #554660 Daniel svn path=/trunk/; revision=3798
ConradIrwin · Oct 2, 2008 · 34a7fc3 · 34a7fc3
1 parent a57ba4c
commit 34a7fc3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  2 22:53:39 CEST 2008 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: fix a nasty bug introduced when cleaning up
+	  entities processing in 2.7.x , fixes #554660
+
 Thu Sep 25 18:04:20 CEST 2008 Daniel Veillard <daniel@veillard.com>
 
 	* HTMLparser.c: fix an HTML parsing error on large data sections

diff --git a/parser.c b/parser.c
@@ -7225,8 +7225,10 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
      * Predefined entites override any extra definition
      */
     ent = xmlGetPredefinedEntity(name);
-    if (ent != NULL)
+    if (ent != NULL) {
+        *str = ptr;
         return(ent);
+    }
 
     /*
      * Increate the number of entity references parsed