[Libreoffice-commits] core.git: package/Library_package2.mk package/source

[Libreoffice Gerrit user]

 package/Library_package2.mk                 |    3 ++-
 package/source/zipapi/XUnbufferedStream.cxx |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 959f22c4e41c42851c2dde3884cf24da4b9eb606
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 26 14:27:16 2018 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 27 12:41:10 2018 +0200

    skip checking zip crcs when fuzzing
    
    Change-Id: If90828e508178dfaaee51f88cf52ada0aec5970c
    Reviewed-on: https://gerrit.libreoffice.org/58120
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 0ff715e031c1..75a15f0e0d08 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -30,8 +30,9 @@ $(eval $(call gb_Library_use_libraries,package2,\
 	cppuhelper \
 	sal \
 	sax \
-	ucbhelper \
 	salhelper \
+	ucbhelper \
+	utl \
 ))
 
 $(eval $(call gb_Library_use_externals,package2,\
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 0aedfac09402..9925d1d5dd5c 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -32,6 +32,8 @@
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 
+#include <unotools/configmgr.hxx>
+
 using namespace ::com::sun::star;
 using namespace com::sun::star::packages::zip::ZipConstants;
 using namespace com::sun::star::io;
@@ -61,7 +63,7 @@ XUnbufferedStream::XUnbufferedStream(
 , mnZipEnd ( 0 )
 , mnZipSize ( 0 )
 , mnMyCurrent ( 0 )
-, mbCheckCRC( !bRecoveryMode )
+, mbCheckCRC(!bRecoveryMode && !utl::ConfigManager::IsFuzzing())
 {
     mnZipCurrent = maEntry.nOffset;
     if ( mbRawStream )