[Libreoffice-commits] core.git: 3 commits - configure.ac lotuswordpro/source unotools/source

[Caolán McNamara]

 configure.ac                               |   12 ++++++------
 lotuswordpro/source/filter/lwpgrfobj.cxx   |    8 ++++++++
 unotools/source/config/securityoptions.cxx |   11 +++++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit 16fc40dc5375d9ffbcaaa0072ab597b39aa3e0d5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 15 16:53:21 2017 +0000

    set include dir on arm etc as well
    
    Change-Id: I13bf9ff8e824f69f54158af1aaf6d4cb5709b04a

diff --git a/configure.ac b/configure.ac
index 7d15f81..22c0f09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7479,6 +7479,12 @@ else
     SYSTEM_JPEG=
     AC_MSG_RESULT([internal, jpeg-turbo])
     BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
+    LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
+    if test "$COM" = "MSC"; then
+        LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
+    else
+        LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
+    fi
 
     case "$host_cpu" in
     x86_64 | amd64 | i*86 | x86 | ia32)
@@ -7643,12 +7649,6 @@ _EOS
             fi
             AC_MSG_WARN([no suitable nasm (Netwide Assembler) found])
         fi
-        LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
-        if test "$COM" = "MSC"; then
-            LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
-        else
-            LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
-        fi
       ;;
     esac
 fi
commit 89b87c04469d716cdf90bc422c5e829178a9fe32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 15 16:44:59 2017 +0000

    ofz: avoid oom
    
    Change-Id: Ia4b9c46949017a53c80f729af66b99c2e4f05cee

diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index cf5cc995..ddb7959 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -160,6 +160,14 @@ void LwpGraphicObject::Read()
         sal_uInt32 nFilterContextSize = m_pObjStrm->QuickReaduInt32();
         if (nFilterContextSize > 0)
         {
+            sal_uInt16 nMaxPossibleSize = m_pObjStrm->remainingSize();
+
+            if (nFilterContextSize > nMaxPossibleSize)
+            {
+                SAL_WARN("lwp", "stream too short for claimed no of records");
+                nFilterContextSize = nMaxPossibleSize;
+            }
+
             pFilterContext = new unsigned char[nFilterContextSize];
             m_pObjStrm->QuickRead(pFilterContext, static_cast<sal_uInt16>(nFilterContextSize));
         }
commit 89628e4814b96b6d1bce768ca9b45eb665871d11
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 15 16:06:02 2017 +0000

    avoid config during fuzzing
    
    Change-Id: I61906c243f592012691d69a335db42b2010402b7

diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 7c51561..569ce16 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -285,10 +285,13 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu
         {
             m_seqSecureURLs.realloc( 0 );
             rValue >>= m_seqSecureURLs;
-            SvtPathOptions  aOpt;
-            sal_uInt32      nCount = m_seqSecureURLs.getLength();
-            for( sal_uInt32 nItem = 0; nItem < nCount; ++nItem )
-                m_seqSecureURLs[ nItem ] = aOpt.SubstituteVariable( m_seqSecureURLs[ nItem ] );
+            if (!utl::ConfigManager::IsAvoidConfig())
+            {
+                SvtPathOptions  aOpt;
+                sal_uInt32      nCount = m_seqSecureURLs.getLength();
+                for( sal_uInt32 nItem = 0; nItem < nCount; ++nItem )
+                    m_seqSecureURLs[ nItem ] = aOpt.SubstituteVariable( m_seqSecureURLs[ nItem ] );
+            }
             m_bROSecureURLs = bRO;
         }
         break;