diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-05-27 22:38:55 +0200 |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-05-27 22:38:55 +0200 |
| commit | bca92a03de88ff9bc9271fd895b62fff80ae9ab5 (patch) | |
| tree | 80f1b9cd891218021f09ee6aec9309585ca25b09 | |
| parent | e1af85e2f8ce49c0450e520beaffd2253b3fd0fb (diff) | |
| download | scons-bca92a03de88ff9bc9271fd895b62fff80ae9ab5.tar.gz | |
- Fix for docbook Tool: we now have to explicitly request the resolving of
external entities when using the libxml2 binding. This is required after
the security issue fix described in http://www.ubuntu.com/usn/usn-2214-1/ and
people.canonical.com/~ubuntu-security/cve/2014/CVE-2014-0191.html .
| -rw-r--r-- | src/engine/SCons/Tool/docbook/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py index aacc26da..26a1a953 100644 --- a/src/engine/SCons/Tool/docbook/__init__.py +++ b/src/engine/SCons/Tool/docbook/__init__.py @@ -242,7 +242,7 @@ def __xml_scan(node, env, path, arg): styledoc = libxml2.parseFile(xsl_file) style = libxslt.parseStylesheetDoc(styledoc) - doc = libxml2.parseFile(str(node)) + doc = libxml2.readFile(str(node), None, libxml2.XML_PARSE_NOENT) result = style.applyStylesheet(doc, None) depfiles = [] @@ -348,7 +348,7 @@ def __xinclude_libxml2(target, source, env): Resolving XIncludes, using the libxml2 module. """ doc = libxml2.readFile(str(source[0]), None, libxml2.XML_PARSE_NOENT) - doc.xincludeProcess() + doc.xincludeProcessFlags(libxml2.XML_PARSE_NOENT) doc.saveFile(str(target[0])) doc.freeDoc() |