diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2015-08-25 21:55:55 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2015-08-25 21:55:55 +0200 |
| commit | 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4 (patch) | |
| tree | 35c498d3ec731bcf7b90ce66bce68ecd54659250 /parserInternals.c | |
| parent | de338c1adfa336ddb5177ceb5c63bcd868a0ebc7 (diff) | |
| parent | 7300193becde71a344c8ac0973dc290fa24d800d (diff) | |
| download | libxml2-21ee18bdbc9a9d4500e12a1399d51c593b8b31d4.tar.gz | |
Merge tag 'upstream/2.9.1+dfsg1'
Upstream version 2.9.1+dfsg1
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/parserInternals.c b/parserInternals.c index df204fd..f8a7041 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -1691,20 +1691,12 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) ctxt->nsWellFormed = 1; ctxt->valid = 1; ctxt->loadsubset = xmlLoadExtDtdDefaultValue; - if (ctxt->loadsubset) { - ctxt->options |= XML_PARSE_DTDLOAD; - } ctxt->validate = xmlDoValidityCheckingDefaultValue; ctxt->pedantic = xmlPedanticParserDefaultValue; - if (ctxt->pedantic) { - ctxt->options |= XML_PARSE_PEDANTIC; - } ctxt->linenumbers = xmlLineNumbersDefaultValue; ctxt->keepBlanks = xmlKeepBlanksDefaultValue; - if (ctxt->keepBlanks == 0) { + if (ctxt->keepBlanks == 0) ctxt->sax->ignorableWhitespace = xmlSAX2IgnorableWhitespace; - ctxt->options |= XML_PARSE_NOBLANKS; - } ctxt->vctxt.finishDtd = XML_CTXT_FINISH_DTD_0; ctxt->vctxt.userData = ctxt; @@ -1716,12 +1708,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) else ctxt->vctxt.warning = xmlParserValidityWarning; ctxt->vctxt.nodeMax = 0; - ctxt->options |= XML_PARSE_DTDVALID; } ctxt->replaceEntities = xmlSubstituteEntitiesDefaultValue; - if (ctxt->replaceEntities) { - ctxt->options |= XML_PARSE_NOENT; - } ctxt->record_info = 0; ctxt->nbChars = 0; ctxt->checkIndex = 0; @@ -2002,8 +1990,7 @@ xmlParserAddNodeInfo(xmlParserCtxtPtr ctxt, /* Otherwise, we need to add new node to buffer */ else { - if ((ctxt->node_seq.length + 1 > ctxt->node_seq.maximum) || - (ctxt->node_seq.buffer == NULL)) { + if (ctxt->node_seq.length + 1 > ctxt->node_seq.maximum) { xmlParserNodeInfo *tmp_buffer; unsigned int byte_size; |