~ubuntu-branches/ubuntu/lucid/libxml2/lucid-security

Viewing changes to parser.c

Committer: Package Import Robot
Author(s): Marc Deslauriers
Date: 2014-06-13 09:15:29 UTC
Revision ID: package-import@ubuntu.com-20140613091529-e3nylqr5dndmoqp8

Tags: 2.7.6.dfsg-1ubuntu1.13

* SECURITY REGRESSION: more xmllint regressions (LP: #1321869)
  - use upstream commit which includes additional regression fixes to
    parser.c.
  - https://git.gnome.org/browse/libxml2/commit/?id=dd8367da17c2948981a51e52c8a6beb445edf825

files modified:
debian/changelog

parser.c

Show diffs side-by-side

added added

removed removed

parser.c

2430

2431

2432

* Note: external parameter entities will not be loaded, it

2433

* isnot required for a non-validating parser, unless the

2433

* is not required for a non-validating parser, unless the

2434

* option of validating, or substituting entities were

2435

* given. Doing so is far more secure as the parser will

2436

* only process data coming from the document entity by

2440

((ctxt->options & XML_PARSE_NOENT) == 0) &&

2441

((ctxt->options & XML_PARSE_DTDVALID) == 0) &&

2442

((ctxt->options & XML_PARSE_DTDLOAD) == 0) &&

2443

((ctxt->options & XML_PARSE_DTDATTR) == 0) &&

2444

(ctxt->replaceEntities == 0) &&

2443

2445

(ctxt->validate == 0))

2444

2446

return;

2445

2447

12119

12121

return(NULL);

12120

12122

}

12121

12123

12124

/* We are loading a DTD */

12125

ctxt->options |= XML_PARSE_DTDLOAD;

12126

12122

12127

12123

12128

* Set-up the SAX context

12124

12129

12247

12252

}

12248

12253

12249

12254

/* We are loading a DTD */

12250

ctxt->options = XML_PARSE_DTDLOAD;

12255

ctxt->options |= XML_PARSE_DTDLOAD;

12251

12256

12252

12257

12253

12258

* Set-up the SAX context

Older »