From f19cfb336150358214572a35ebe6c97c4975d6a0 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Wed, 9 Jul 2014 02:01:57 +0200
Subject: Static Code Analysis : Correctly initialize member variables in
 various constructors

---
 src/Common/SecurityToken.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/Common/SecurityToken.h')

diff --git a/src/Common/SecurityToken.h b/src/Common/SecurityToken.h
index c83ed328..8cad17c1 100644
--- a/src/Common/SecurityToken.h
+++ b/src/Common/SecurityToken.h
@@ -69,7 +69,7 @@ namespace VeraCrypt
 
 	struct SecurityTokenKeyfile
 	{
-		SecurityTokenKeyfile () { }
+		SecurityTokenKeyfile () : Handle(CK_INVALID_HANDLE), SlotId(CK_UNAVAILABLE_INFORMATION) { Token.SlotId = CK_UNAVAILABLE_INFORMATION; Token.Flags = 0; }
 		SecurityTokenKeyfile (const SecurityTokenKeyfilePath &path);
 
 		operator SecurityTokenKeyfilePath () const;
@@ -85,7 +85,8 @@ namespace VeraCrypt
 	{
 		Pkcs11Exception (CK_RV errorCode = (CK_RV) -1)
 			: ErrorCode (errorCode),
-			SubjectErrorCodeValid (false)
+			SubjectErrorCodeValid (false),
+			SubjectErrorCode( (uint64) -1)
 		{
 		}
 
@@ -155,7 +156,7 @@ namespace VeraCrypt
 
 	struct Pkcs11Session
 	{
-		Pkcs11Session () : UserLoggedIn (false) { }
+		Pkcs11Session () : Handle (CK_UNAVAILABLE_INFORMATION), UserLoggedIn (false) { }
 
 		CK_SESSION_HANDLE Handle;
 		bool UserLoggedIn;
-- 
cgit v1.2.3