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

[Caolán McNamara]

 filter/source/msfilter/util.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ce59fb3e1758e6ac0b2d7e203c4770117ff7d36
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 6 13:27:34 2013 +0000

    rearrange tests to avoid access past end of string
    
    as demonstrated by abi6637-1.doc
    
    Change-Id: Ieed0ca7ccf2d8587179a4530a1da29d7d8228363

diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index c2e48ce..5646e23 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -516,7 +516,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken()
 
     nSavPtr = nNext;
 
-    if ( aData[nFnd]=='\\' && nFnd+1<aData.getLength() && aData[nFnd+1]!='\\' )
+    if (nFnd+1<aData.getLength() && aData[nFnd+1]!='\\' && aData[nFnd]=='\\')
     {
         const sal_Int32 nRet = aData[++nFnd];
         nNext = ++nFnd;             // und dahinter setzen