diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-05-27 20:38:55 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-05-27 20:38:55 (GMT) |
| commit | f954f0c9a47cff55a7828c335205ec33f8c0c8b6 (patch) | |
| tree | 80f1b9cd891218021f09ee6aec9309585ca25b09 /src/engine/SCons/Tool/docbook | |
| parent | bebd12923cbb9632875c8a6367efb23a74f9c1f8 (diff) | |
| download | SCons-f954f0c9a47cff55a7828c335205ec33f8c0c8b6.zip SCons-f954f0c9a47cff55a7828c335205ec33f8c0c8b6.tar.gz SCons-f954f0c9a47cff55a7828c335205ec33f8c0c8b6.tar.bz2 | |
- 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 .
Diffstat (limited to 'src/engine/SCons/Tool/docbook')
| -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 aacc26d..26a1a95 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() |