diff -r b8d67d6176f5 -r 3c221667e687 phoneuis/easydialing/src/easydialingcontactdatamanager.cpp --- a/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp Wed Jun 09 09:41:11 2010 +0300 +++ b/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp Mon Jun 21 15:39:45 2010 +0300 @@ -610,15 +610,12 @@ { LOGSTRING( "CEasyDialingContactDataManager: ContactLinkLC" ); - if( aIndex >= 0 ) + if ( aIndex < 0 || aIndex >= iContactDataArray.Count() ) { - // If the parsed index is valid, return the availability. - return iContactDataArray[ aIndex ]->ContactLink()->PackLC(); + User::Leave( KErrArgument ); } - else - { - return NULL; - } + + return iContactDataArray[ aIndex ]->ContactLink()->PackLC(); }