Re-merge fix for bug 2672 RCL_3 PDK_3.0.0
authorWilliam Roberts <williamr@symbian.org>
Fri, 28 May 2010 13:40:59 +0100
branchRCL_3
changeset 31 4c1d1f271d77
parent 30 2de6635c154b (current diff)
parent 29 564c37657928 (diff)
child 45 d7c0456a48f9
Re-merge fix for bug 2672
--- 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);
        }