[Libreoffice-commits] core.git: 2 commits - helpcompiler/source

[Caolán McNamara (via logerrit)]

 helpcompiler/source/HelpCompiler.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 77cb90532d14d5035990d078977fce7b407c4fad
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 22 12:11:53 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 22 15:31:07 2019 +0100

    cid#1448239 unsafe_xml_parse_config
    
    This branch is only in use for the build-tool mode, so doesn't affect extension
    help.
    
    I can find no difference in our output help dir with these removed vs in place
    so lets remove it.
    
    Change-Id: If8511b6cb74f1af136a71ab39a7a5759d50c43eb
    Reviewed-on: https://gerrit.libreoffice.org/83480
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 78d16b2feaf3..678cf8ee033a 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -130,9 +130,6 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
         {
             static std::string fsroot('\'' + src.toUTF8() + '\'');
 
-            // coverity[unsafe_xml_parse_config] - entity support is required in the build-time only utility
-            xmlSubstituteEntitiesDefault(1);
-            xmlLoadExtDtdDefaultValue = 1;
             cur = xsltParseStylesheetFile(reinterpret_cast<const xmlChar *>(resEmbStylesheet.native_file_string().c_str()));
 
             int nbparams = 0;
commit 82d2049df2fd9ed4275b93762d75600287f7d926
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 22 12:11:04 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 22 15:30:52 2019 +0100

    cid#1448239 unsafe_xml_parse_config
    
    Change-Id: I85e471943338baca756707e8e40f46ff69d96a36
    Reviewed-on: https://gerrit.libreoffice.org/83479
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 4407d12c7c03..78d16b2feaf3 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -130,6 +130,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
         {
             static std::string fsroot('\'' + src.toUTF8() + '\'');
 
+            // coverity[unsafe_xml_parse_config] - entity support is required in the build-time only utility
             xmlSubstituteEntitiesDefault(1);
             xmlLoadExtDtdDefaultValue = 1;
             cur = xsltParseStylesheetFile(reinterpret_cast<const xmlChar *>(resEmbStylesheet.native_file_string().c_str()));