Commit 9ca682f5 authored by William M. Brack's avatar William M. Brack
Browse files

fixed segfault when input file not present changed output formatting of

* xmlIO.c: fixed segfault when input file not present
* tree.c: changed output formatting of XML_CDATA_SECTION
  (bug 120917)
parent 76e95df0
Sun Oct 19 17:33:27 HKT 2003 William Brack <wbrack@mmm.com.hk>
* xmlIO.c: fixed segfault when input file not present
* tree.c: changed output formatting of XML_CDATA_SECTION
(bug 120917)
Sun Oct 19 00:15:38 HKT 2003 William Brack <wbrack@mmm.com.hk>
 
* include/libxml/parserInternals.h HTMLparser.c HTMLtree.c
......
......@@ -7481,7 +7481,8 @@ xmlNodeDumpOutputInternal(xmlOutputBufferPtr buf, xmlDocPtr doc,
if (format == 1) {
tmp = cur->children;
while (tmp != NULL) {
if ((tmp->type == XML_TEXT_NODE) ||
if ((tmp->type == XML_TEXT_NODE) ||
(tmp->type == XML_CDATA_SECTION_NODE) ||
(tmp->type == XML_ENTITY_REF_NODE)) {
format = 0;
break;
......
......@@ -3083,6 +3083,7 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
if (ret == NULL) {
xmlLoaderErr(ctxt, "failed to load external entity \"%s\"\n",
(const char *) resource);
return(NULL);
}
if ((ret->buf != NULL) && (ret->buf->readcallback == xmlIOHTTPRead)) {
const char *encoding;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment