diff --git a/ChangeLog b/ChangeLog index 4cc76d3e..49a57d8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 17 22:04:31 CEST 2006 Daniel Veillard + + * HTMLparser.c: fixed teh 2 stupid bugs affecting htmlReadDoc() and + htmlReadIO() this should fix #340322 + Tue Oct 17 21:39:23 CEST 2006 Daniel Veillard * xpath.c: applied patch from Olaf Walkowiak which should fix #334104 diff --git a/HTMLparser.c b/HTMLparser.c index 55557662..aac2a78f 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -4347,7 +4347,8 @@ htmlCreateMemoryParserCtxt(const char *buffer, int size) { * Returns the new parser context or NULL */ static htmlParserCtxtPtr -htmlCreateDocParserCtxt(xmlChar *cur, const char *encoding ATTRIBUTE_UNUSED) { +htmlCreateDocParserCtxt(const xmlChar *cur, + const char *encoding ATTRIBUTE_UNUSED) { int len; htmlParserCtxtPtr ctxt; @@ -5936,7 +5937,7 @@ htmlReadDoc(const xmlChar * cur, const char *URL, const char *encoding, int opti return (NULL); xmlInitParser(); - ctxt = xmlCreateDocParserCtxt(cur); + ctxt = htmlCreateDocParserCtxt(cur, NULL); if (ctxt == NULL) return (NULL); return (htmlDoRead(ctxt, URL, encoding, options, 0)); @@ -6060,7 +6061,7 @@ htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, XML_CHAR_ENCODING_NONE); if (input == NULL) return (NULL); - ctxt = xmlNewParserCtxt(); + ctxt = htmlNewParserCtxt(); if (ctxt == NULL) { xmlFreeParserInputBuffer(input); return (NULL);