From b9240ac3695c0f4b88c539721f13dc03b5afdabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 1 Oct 2013 15:14:30 +0100 Subject: [PATCH] Resolves: rhbz#1013480 crash in EditLineList::operator[] avoid crashing anyway, though unknown how to end up in this scenario Change-Id: Ib602c73478e5c4772cfef73f70c67ad22877a39f --- editeng/source/editeng/impedit2.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 4bc6d70..8dd3e35 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4119,10 +4119,13 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex ? GetYValue( rLSItem.GetInterLineSpace() ) : 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; 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]; if ( ( pTmpLine->GetStart() == nIndex ) || ( pTmpLine->IsIn( nIndex, bEOL ) ) ) @@ -4141,7 +4144,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex // Cursor at the End of the paragraph. OSL_ENSURE( nIndex == nCurIndex, "Index dead wrong in GetEditCursor!" ); - pLine = pPortion->GetLines()[pPortion->GetLines().Count()-1]; + pLine = pPortion->GetLines()[nLineCount-1]; nY -= pLine->GetHeight(); if ( !aStatus.IsOutliner() ) nY -= nSBL; -- 1.8.3.1