commit 5ea30d7f9523dfd6280251f0310b0fd75c461aa8
author Daniel Veillard <veillard@src.gnome.org> Mon Nov 08 11:54:28 2004 +0000
committer Daniel Veillard <veillard@src.gnome.org> Mon Nov 08 11:54:28 2004 +0000
tree d0a88f1e684c5c2fc9025f03df836d2594769e5f
parent 4259532303e96e089a185c6f55056cb7c4902d71

more fixes. Daniel

* parser.c testapi.c xmlIO.c xmlstring.c: more fixes.
Daniel

parser.c

diff --git a/parser.c b/parser.c
index 7399bfc..05c31a9 100644
--- a/parser.c
+++ b/parser.c
@@ -9978,7 +9978,11 @@
 	    xmlFreeParserCtxt(ctxt);
 	    return(NULL);
 	}
-	memcpy(ctxt->sax, sax, sizeof(xmlSAXHandler));
+	memset(ctxt->sax, 0, sizeof(xmlSAXHandler));
+	if (sax->initialized == XML_SAX2_MAGIC)
+	    memcpy(ctxt->sax, sax, sizeof(xmlSAXHandler));
+	else
+	    memcpy(ctxt->sax, sax, sizeof(xmlSAXHandlerV1));
 	if (user_data != NULL)
 	    ctxt->userData = user_data;
     }	
@@ -10081,7 +10085,11 @@
 	    xmlFree(ctxt);
 	    return(NULL);
 	}
-	memcpy(ctxt->sax, sax, sizeof(xmlSAXHandler));
+	memset(ctxt->sax, 0, sizeof(xmlSAXHandler));
+	if (sax->initialized == XML_SAX2_MAGIC)
+	    memcpy(ctxt->sax, sax, sizeof(xmlSAXHandler));
+	else
+	    memcpy(ctxt->sax, sax, sizeof(xmlSAXHandlerV1));
 	if (user_data != NULL)
 	    ctxt->userData = user_data;
     }