mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid 1-past-the-end string access

Browse Source 
Change-Id: Ia475ce737c430fab8d019e1b8a762f81897e0847
This commit is contained in:
Lionel Elie Mamane
2015-07-21 14:02:59 +02:00
parent 3e926736c7
commit 0aff4109b5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vcl/source/control/field2.cxx
View File

@@ -432,15 +432,14 @@ static sal_Int32 ImplPatternRightPos( const OUString& rStr, const OString& rEdit
{ {
// search non-literal successor // search non-literal successor
sal_Int32 nNewPos = nCursorPos; sal_Int32 nNewPos = nCursorPos;
sal_Int32 nTempPos = nNewPos; ;
while ( nTempPos < rEditMask.getLength() ) for(sal_Int32 nTempPos = nNewPos+1; nTempPos < rEditMask.getLength(); ++nTempPos )
{ {
if ( rEditMask[nTempPos+1] != EDITMASK_LITERAL ) if ( rEditMask[nTempPos] != EDITMASK_LITERAL )
{ {
nNewPos = nTempPos+1; nNewPos = nTempPos;
break; break;
} }
nTempPos++;
} }
ImplPatternMaxPos( rStr, rEditMask, nFormatFlags, bSameMask, nCursorPos, nNewPos ); ImplPatternMaxPos( rStr, rEditMask, nFormatFlags, bSameMask, nCursorPos, nNewPos );
return nNewPos; return nNewPos;