libxml2 r3717 - trunk

[veillard svn gnome org]

Author: veillard
Date: Wed Mar 26 14:06:44 2008
New Revision: 3717
URL: http://svn.gnome.org/viewvc/libxml2?rev=3717&view=rev

Log:
* parser.c: patch from Ashwin to avoid a problem of attribute
  redefinition in the DTD. Remove a warning too.
Daniel


Modified:
   trunk/ChangeLog
   trunk/parser.c

Modified: trunk/parser.c
==============================================================================
--- trunk/parser.c	(original)
+++ trunk/parser.c	Wed Mar 26 14:06:44 2008
@@ -978,6 +978,14 @@
     const xmlChar *name;
     const xmlChar *prefix;
 
+    /*
+     * Allows to detect attribute redefinitions
+     */
+    if (ctxt->attsSpecial != NULL) {
+        if (xmlHashLookup2(ctxt->attsSpecial, fullname, fullattr) != NULL)
+	    return;
+    }
+
     if (ctxt->attsDefault == NULL) {
         ctxt->attsDefault = xmlHashCreateDict(10, ctxt->dict);
 	if (ctxt->attsDefault == NULL)
@@ -8049,7 +8057,7 @@
 	        val2 = xmlAttrNormalizeSpace2(ctxt, val, len);
 		if (val2 != NULL) {
 		    xmlFree(val);
-		    val = val2;
+		    val = (xmlChar *) val2;
 		}
 	    }
 	}