[Libreoffice-commits] core.git: sw/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Sep 16 10:23:31 UTC 2021


 sw/source/uibase/app/docshini.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e58e828d4877f9068e4a69c52ac9c7fe6e65d032
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 16 08:48:22 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 16 12:22:56 2021 +0200

    ofz#38757 avoid config during fuzzing
    
    Change-Id: Ie56e70faf40ec63ba5b17a8a9ea5f2947bbe53e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122174
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 6cc2448d5a99..aabd3e8e4eb6 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -107,7 +107,8 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
             SwTransferable::InitOle( this );
 
         // set forbidden characters if necessary
-        if (!utl::ConfigManager::IsFuzzing())
+        const bool bFuzzing = utl::ConfigManager::IsFuzzing();
+        if (!bFuzzing)
         {
             SvxAsianConfig aAsian;
             const Sequence<lang::Locale> aLocales =  aAsian.GetStartEndCharLocales();
@@ -236,7 +237,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
         sal_uInt16 nFontWhich = RES_CHRATR_FONT;
         sal_uInt16 nFontHeightWhich = RES_CHRATR_FONTSIZE;
         LanguageType eLanguage = m_xDoc->GetDefault( RES_CHRATR_LANGUAGE ).GetLanguage();
-        bool bDisableBuiltinStyles = officecfg::Office::Common::Load::DisableBuiltinStyles::get();
+        bool bDisableBuiltinStyles = !bFuzzing && officecfg::Office::Common::Load::DisableBuiltinStyles::get();
         sal_uInt8 nLimit = bDisableBuiltinStyles ? 0 : 24;
         for(sal_uInt8 nIdx = 0; nIdx < nLimit; nIdx += 2)
         {


More information about the Libreoffice-commits mailing list