summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-11-06 13:27:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-11-06 13:27:37 +0000
commit0ce59fb3e1758e6ac0b2d7e203c4770117ff7d36 (patch)
tree5cb4349dd87c38a63683222670fe36ef5ffe5fc8 /filter
parentc7332236cdf059645ec206b890d7975cf965da54 (diff)
rearrange tests to avoid access past end of string
as demonstrated by abi6637-1.doc Change-Id: Ieed0ca7ccf2d8587179a4530a1da29d7d8228363
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/util.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index c2e48ce51592..5646e2351903 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