# HG changeset patch # User William Roberts # Date 1275050459 -3600 # Node ID 4c1d1f271d77d636d501397ec330f1d659c618a4 # Parent 2de6635c154b7dd0996a7328c87bd6a85f576e13# Parent 564c37657928be89ed72fba68476987d347ec0de Re-merge fix for bug 2672 diff -r 2de6635c154b -r 4c1d1f271d77 remotemgmt_plat/terminal_security_device_lock_api/inc/dmencryptionutil.inl --- a/remotemgmt_plat/terminal_security_device_lock_api/inc/dmencryptionutil.inl Tue May 25 13:36:17 2010 +0300 +++ b/remotemgmt_plat/terminal_security_device_lock_api/inc/dmencryptionutil.inl Fri May 28 13:40:59 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); }