diff -r 24062c24fe38 -r 2a26698d78ba phoneuis/Ussd/src/UssdEditorLines.cpp --- a/phoneuis/Ussd/src/UssdEditorLines.cpp Fri Mar 12 15:42:40 2010 +0200 +++ b/phoneuis/Ussd/src/UssdEditorLines.cpp Mon Mar 15 12:40:24 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -104,9 +104,9 @@ { // Move rectangles to right position - for ( TInt i = 0; - i < iRects->Count() && i < UssdLayout::NumberOfEditorLines(); - i++ ) + for ( TInt i = 0; + iRects && i < iRects->Count() && i < UssdLayout::NumberOfEditorLines(); + i++ ) { iRects->At( i )->LayoutRect( Rect() , UssdLayout::MessageWritingLayoutElements6( i+1 ) ); @@ -151,7 +151,7 @@ // Draw row lines by clearing rectangles corresponding to row locations. TInt count( iRects->Count() ); TInt lines( UssdLayout::NumberOfEditorLines() ); - for ( TInt i = 0; i < count && i < lines; i++ ) + for ( TInt i = 0; iRects && i < count && i < lines; i++ ) { gc.Clear( iRects->At( i )->Rect() ); }