vcl/source/control/field2.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit fd637152e66d2fe8a0fddf0a840cc65bdf5cf576
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Tue Jul 21 14:02:59 2015 +0200
avoid 1-past-the-end string access
Change-Id: Ia475ce737c430fab8d019e1b8a762f81897e0847
Reviewed-on: https://gerrit.libreoffice.org/17261
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 326b946..dd4a569 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -432,15 +432,14 @@ static sal_Int32 ImplPatternRightPos( const OUString&
rStr, const OString& rEdit
{
// search non-literal successor
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;
}
- nTempPos++;
}
ImplPatternMaxPos( rStr, rEditMask, nFormatFlags, bSameMask, nCursorPos,
nNewPos );
return nNewPos;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
