--- a/accessoryservices/accessoryserver/src/Policy/AccPolGenericIDArrayAccessor.cpp Wed Apr 14 17:17:45 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Policy/AccPolGenericIDArrayAccessor.cpp Tue Apr 27 17:57:16 2010 +0300
@@ -116,13 +116,17 @@
COM_TRACE_( "[AccFW: ACCPOLICY] TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray()" );
TInt iArrayCount( aGenericIDArray.Count() );
- TInt i(aIndex);
- for ( ; i < (iArrayCount-1); ++i )
- {
- aGenericIDArray.iGenericIDArray[i] = aGenericIDArray.iGenericIDArray[i+1];
- }
- TAccPolGenericID emptyID;
- aGenericIDArray.iGenericIDArray[i] = emptyID;
+ TInt i(aIndex);
+
+ if( (iArrayCount > 0) && (i >= 0) )
+ {
+ for ( ; i < (iArrayCount-1); ++i )
+ {
+ aGenericIDArray.iGenericIDArray[i] = aGenericIDArray.iGenericIDArray[i+1];
+ }
+ TAccPolGenericID emptyID;
+ aGenericIDArray.iGenericIDArray[i] = emptyID;
+ }
COM_TRACE_( "[AccFW: ACCPOLICY] TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray() - return void" );
}