Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-06-17 18:16:07 -05:00
Code Activity

Windows: fix favorite volume mount race

Browse Source 
Copy selected favorite volumes into mount thread parameters so background mounting does not depend on mutable global vector storage. Also avoid unnecessary FavoriteVolume copies in auto-mount paths and fix mount-on-arrival state updates.

Refs #1661
This commit is contained in:
Mounir IDRASSI
2026-04-18 14:59:26 +09:00
parent da2198831f
commit e6adb96b15
3 changed files with 88 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mount/Favorites.cpp
+9 -9
View File
@@ -290,7 +290,7 @@ namespace VeraCrypt
{
bMountFavoritesOnLogon = FALSE;
foreach (const FavoriteVolume &favorite, Favorites)
for (const FavoriteVolume& favorite: Favorites)
{
if (favorite.MountOnLogOn)
{
@@ -301,7 +301,7 @@ namespace VeraCrypt
if (!bEnableBkgTask || bCloseBkgTaskWhenNoVolumes || IsNonInstallMode())
{
foreach (const FavoriteVolume favorite, Favorites)
for (const FavoriteVolume& favorite: Favorites)
{
if (favorite.MountOnArrival)
{
@@ -482,7 +482,7 @@ namespace VeraCrypt
AppendMenu (FavoriteVolumesMenu, MF_SEPARATOR, 0, L"");
int i = 0;
foreach (const FavoriteVolume &favorite, FavoriteVolumes)
for (const FavoriteVolume& favorite: FavoriteVolumes)
{
UINT flags = MF_STRING;
@@ -512,7 +512,7 @@ namespace VeraCrypt
SendMessage (favoriteListControl, LVM_DELETEALLITEMS, 0, 0);
int line = 0;
foreach (const FavoriteVolume favorite, favorites)
for (const FavoriteVolume& favorite: favorites)
{
ListItemAdd (favoriteListControl, line, (wchar_t *) favorite.MountPoint.substr (0, 2).c_str());
FillListControlSubItems (favoriteListControl, line++, favorite);
@@ -533,7 +533,7 @@ namespace VeraCrypt
wstring GetFavoriteVolumeLabel (const wstring &volumePath, bool& useInExplorer)
{
foreach (const FavoriteVolume &favorite, FavoriteVolumes)
for (const FavoriteVolume& favorite: FavoriteVolumes)
{
if (favorite.Path == volumePath)
{
@@ -542,7 +542,7 @@ namespace VeraCrypt
}
}
foreach (const FavoriteVolume &favorite, SystemFavoriteVolumes)
for (const FavoriteVolume& favorite: SystemFavoriteVolumes)
{
if (favorite.Path == volumePath)
{
@@ -735,7 +735,7 @@ namespace VeraCrypt
FavoritesOnArrivalMountRequired.clear();
for (const FavoriteVolume favorite: FavoriteVolumes)
for (const FavoriteVolume& favorite: FavoriteVolumes)
{
if (favorite.MountOnArrival)
{
@@ -745,7 +745,7 @@ namespace VeraCrypt
{
bool present = false;
for (const FavoriteVolume favoriteConnected: FavoritesMountedOnArrivalStillConnected)
for (const FavoriteVolume& favoriteConnected: FavoritesMountedOnArrivalStillConnected)
{
if (favorite.Path == favoriteConnected.Path)
{
@@ -795,7 +795,7 @@ namespace VeraCrypt
XmlWriteHeader (f);
fputws (L"\n\t<favorites>", f);
foreach (const FavoriteVolume &favorite, favorites)
for (const FavoriteVolume& favorite: favorites)
{
wchar_t tq[2048];