--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Fri Feb 19 23:59:33 2010 +0200
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Fri Mar 12 15:49:38 2010 +0200
@@ -454,7 +454,7 @@
     RMobileENStore::TMobileENEntryV1& entry = ( *entryPckg )();
 
     // Check that client uses valid location index
-    if ( 0 < entry.iIndex )
+    if (0 < entry.iIndex && sizeof( RMobileENStore::TMobileENEntryV1 ) <= aEntry->MaxLength())
         {
         // Forward request to GSM Extension
         ret = iMmENStoreExtInterface->Read( 
@@ -464,7 +464,7 @@
     // ISI message construction failed or phonet sender returned error
     if ( KErrNone != ret )
         {
-        ReqCompleted( aTsyReqHandle, ret );
+        ReqCompleted( aTsyReqHandle, ret ); 
         }
     else
         {