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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 18 09:16:46 UTC 2019


 vcl/source/filter/graphicfilter.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 857c72b6eaa7ecb96300a096280dae8e2895d05c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 18 09:00:17 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 18 11:12:00 2019 +0200

    ofz#15335 avoid config during fuzzing
    
    Change-Id: I7a0270fb36b4390ae2e8f365ace8e724938224c3
    Reviewed-on: https://gerrit.libreoffice.org/74249
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index c6b26c6ec2da..9742715aa4fd 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -26,6 +26,7 @@
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <tools/fract.hxx>
+#include <unotools/configmgr.hxx>
 #include <unotools/resmgr.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
@@ -1770,7 +1771,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
                 if( nFormat != GRFILTER_FORMAT_DONTKNOW )
                 {
                     aShortName = GetImportFormatShortName( nFormat ).toAsciiUpperCase();
-                    if (aShortName == "PCD")
+                    if (aShortName == "PCD" && !utl::ConfigManager::IsFuzzing())
                     {
                         OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Import/PCD" );
                         pFilterConfigItem = std::make_unique<FilterConfigItem>( aFilterConfigPath );


More information about the Libreoffice-commits mailing list