[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpidxmgr.cxx  |    2 +-
 lotuswordpro/source/filter/lwpobjstrm.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5856747dfc02b0602989269015bab419cdcbaad2
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Dec 9 11:56:52 2015 +0000

    guard against corrupt ObjIndexData
    
    Change-Id: I214991e5d34c8e335cdd8ea482f8fa4913ba637b
    (cherry picked from commit c88a23b9d44118e96de41a70ab7f87eb0aafb126)
    Reviewed-on: https://gerrit.libreoffice.org/20501
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx 
b/lotuswordpro/source/filter/lwpidxmgr.cxx
index 2e675f3..8d02521 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.cxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.cxx
@@ -213,7 +213,7 @@ void LwpIndexManager::ReadObjIndexData(LwpObjectStream* 
pObjStrm)
             vObjIndexs[k]->offset = pObjStrm->QuickReaduInt32();
 
         for (k = 0; k < LeafCount; k++)
-            m_TempVec[k] = pObjStrm->QuickReaduInt32();
+            m_TempVec.at(k) = pObjStrm->QuickReaduInt32();
     }
 
     for( sal_uInt16 j=0; j<LeafCount; j++ )
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx 
b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 2ab543a4..9a4e19d 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -169,7 +169,7 @@ sal_uInt16 LwpObjectStream::QuickRead(void* buf, sal_uInt16 
len)
     memset(buf, 0, len);
     if( len > m_nBufSize - m_nReadPos )
     {
-        assert(false);
+        SAL_WARN("lwp", "read request longer than buffer");
         len = m_nBufSize - m_nReadPos;
     }
     if( m_pContentBuf && len)

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits