From 65500305404a6100b50161343637c115e5718c9e Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Mon, 2 Mar 2020 17:44:12 +0100
Subject: Windows: Fix keyfiles path passed as CLI argument and set as default
 not always cleared from RAM when VeraCrypt exits

---
 src/Common/Dlgcode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Common')

diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 5a2ed526..244a82b1 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -179,7 +179,7 @@ BOOL bInPlaceEncNonSysPending = FALSE;		// TRUE if the non-system in-place encry
 BOOL PimEnable = FALSE;
 BOOL KeyFilesEnable = FALSE;
 KeyFile	*FirstKeyFile = NULL;
-KeyFilesDlgParam		defaultKeyFilesParam;
+KeyFilesDlgParam		defaultKeyFilesParam = {0};
 
 BOOL IgnoreWmDeviceChange = FALSE;
 BOOL DeviceChangeBroadcastDisabled = FALSE;
@@ -487,6 +487,8 @@ void FinalizeGlobalLocks ()
 void cleanup ()
 {
 	burn (&CmdTokenPin, sizeof (CmdTokenPin));
+	KeyFileRemoveAll (&FirstKeyFile);
+	KeyFileRemoveAll (&defaultKeyFilesParam.FirstKeyFile);
 
 	/* Cleanup the GDI fonts */
 	if (hFixedFont != NULL)
-- 
cgit v1.2.3