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

Resolves: rhbz#1013480 crash in EditLineList::operator[]

Browse Source 
avoid crashing anyway, though unknown how to end up in
this scenario

Change-Id: Ib602c73478e5c4772cfef73f70c67ad22877a39f
This commit is contained in:
Caolán McNamara
2013-10-01 15:14:30 +01:00
parent d05a9ae25e
commit 165aca6a01
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editeng/source/editeng/impedit2.cxx
View File

@@ -4162,10 +4162,13 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex
? GetYValue( rLSItem.GetInterLineSpace() ) : 0; ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
sal_uInt16 nCurIndex = 0; sal_uInt16 nCurIndex = 0;
OSL_ENSURE( pPortion->GetLines().Count(), "Empty ParaPortion in GetEditCursor!" ); size_t nLineCount = pPortion->GetLines().Count();
OSL_ENSURE( nLineCount, "Empty ParaPortion in GetEditCursor!" );
if (nLineCount == 0)
return Rectangle();
const EditLine* pLine = NULL; const EditLine* pLine = NULL;
sal_Bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? sal_True : sal_False; sal_Bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? sal_True : sal_False;
for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ ) for (size_t nLine = 0; nLine < nLineCount; ++nLine)
{ {
const EditLine* pTmpLine = pPortion->GetLines()[nLine]; const EditLine* pTmpLine = pPortion->GetLines()[nLine];
if ( ( pTmpLine->GetStart() == nIndex ) || ( pTmpLine->IsIn( nIndex, bEOL ) ) ) if ( ( pTmpLine->GetStart() == nIndex ) || ( pTmpLine->IsIn( nIndex, bEOL ) ) )
@@ -4184,7 +4187,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex
// Cursor at the End of the paragraph. // Cursor at the End of the paragraph.
OSL_ENSURE( nIndex == nCurIndex, "Index dead wrong in GetEditCursor!" ); OSL_ENSURE( nIndex == nCurIndex, "Index dead wrong in GetEditCursor!" );
pLine = pPortion->GetLines()[pPortion->GetLines().Count()-1]; pLine = pPortion->GetLines()[nLineCount-1];
nY -= pLine->GetHeight(); nY -= pLine->GetHeight();
if ( !aStatus.IsOutliner() ) if ( !aStatus.IsOutliner() )
nY -= nSBL; nY -= nSBL;