[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par4.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d3a0ba91dbe0c517ed70fcb9d109b4d63d828fb4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 18 12:51:07 2018 +0000

    ofz#6999 check available data len
    
    Change-Id: I89a7913d35706ee5797beee654ef99be088431b8
    Reviewed-on: https://gerrit.libreoffice.org/51498
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 7ee6fac81825..8a6bcee8c420 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -477,8 +477,8 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType,
     const sal_uInt8* pSprmCDttmRMark;
     if( nsRedlineType_t::REDLINE_FORMAT == eType )
     {
-        pSprmCIbstRMark = pData+1;
-        pSprmCDttmRMark = pData+3;
+        pSprmCIbstRMark = nLen >= 3 ? pData+1 : nullptr;
+        pSprmCDttmRMark = nLen >= 7 ? pData+3 : nullptr;
     }
     else
     {