mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-12-01 07:23:29 +01:00
Windows: avoid leaking location of selected keyfiles by clearing global variable used to store multiple file selection path.
This commit is contained in:
parent
59afc2c4d9
commit
3cda204626
@ -4160,6 +4160,7 @@ BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, wchar_t *lpszFileN
|
||||
|
||||
ZeroMemory (&ofn, sizeof (ofn));
|
||||
|
||||
SelectMultipleFilesPath[0] = 0;
|
||||
*lpszFileName = 0;
|
||||
ofn.lStructSize = sizeof (ofn);
|
||||
ofn.hwndOwner = hwndDlg;
|
||||
@ -4192,6 +4193,7 @@ BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, wchar_t *lpszFileN
|
||||
// Single file selected
|
||||
StringCbCopyW (lpszFileName, cbFileName, SelectMultipleFilesPath);
|
||||
SelectMultipleFilesOffset = 0;
|
||||
SecureZeroMemory (SelectMultipleFilesPath, sizeof (SelectMultipleFilesPath));
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -4229,7 +4231,10 @@ BOOL SelectMultipleFilesNext (wchar_t *lpszFileName, size_t cbFileName)
|
||||
|
||||
SelectMultipleFilesOffset += (int) wcslen (SelectMultipleFilesPath + SelectMultipleFilesOffset) + 1;
|
||||
if (SelectMultipleFilesPath[SelectMultipleFilesOffset] == 0)
|
||||
{
|
||||
SelectMultipleFilesOffset = 0;
|
||||
SecureZeroMemory (SelectMultipleFilesPath, sizeof (SelectMultipleFilesPath));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user