# HG changeset patch # User Pat Downey # Date 1274196153 -3600 # Node ID 564c37657928be89ed72fba68476987d347ec0de # Parent 915074efc433d1edd510367c3ce7762fbf1b93e9# Parent d73e879fec174d580f36720cb11815ee9dd3717d Merge fix for bug 2672. diff -r 915074efc433 -r 564c37657928 remotemgmt_plat/terminal_security_device_lock_api/inc/dmencryptionutil.inl --- a/remotemgmt_plat/terminal_security_device_lock_api/inc/dmencryptionutil.inl Tue May 11 16:59:53 2010 +0300 +++ b/remotemgmt_plat/terminal_security_device_lock_api/inc/dmencryptionutil.inl Tue May 18 16:22:33 2010 +0100 @@ -68,7 +68,8 @@ { User::Leave(terr); } - if(infoArray.Count() > 1) + // darios: should also take account of count returning 0 + if(infoArray.Count() == 0 || infoArray.Count() > 1) { User::Leave(KErrBadName); }