mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-09-01 13:47:16 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
177ec1fce1 | ||
|
|
2dbc718225 |
@@ -766,7 +766,10 @@ namespace VeraCrypt
|
|||||||
if (options->Type == VolumeType::Normal && wxDirExists(parentDir) && wxGetDiskSpace (parentDir, nullptr, &diskSpace))
|
if (options->Type == VolumeType::Normal && wxDirExists(parentDir) && wxGetDiskSpace (parentDir, nullptr, &diskSpace))
|
||||||
{
|
{
|
||||||
AvailableDiskSpace = (uint64) diskSpace.GetValue ();
|
AvailableDiskSpace = (uint64) diskSpace.GetValue ();
|
||||||
if (maxVolumeSize > AvailableDiskSpace)
|
// Honor --no-size-check so a (sparse) file container larger than the
|
||||||
|
// current free space can be created from the command line, mirroring
|
||||||
|
// the GUI wizard behavior (see VolumeSizeWizardPage.cpp).
|
||||||
|
if (maxVolumeSize > AvailableDiskSpace && !CmdLine->ArgDisableFileSizeCheck)
|
||||||
maxVolumeSize = AvailableDiskSpace;
|
maxVolumeSize = AvailableDiskSpace;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -779,8 +782,8 @@ namespace VeraCrypt
|
|||||||
else if (AvailableDiskSpace)
|
else if (AvailableDiskSpace)
|
||||||
{
|
{
|
||||||
// caller requesting maximum size
|
// caller requesting maximum size
|
||||||
// we use maxVolumeSize because it is guaranteed to be less or equal to AvailableDiskSpace for outer volumes
|
// Limit "max" to available disk space even when --no-size-check allows explicit sparse sizes beyond it.
|
||||||
options->Size = maxVolumeSize;
|
options->Size = VC_MIN (maxVolumeSize, AvailableDiskSpace);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -808,8 +811,8 @@ namespace VeraCrypt
|
|||||||
else if (AvailableDiskSpace)
|
else if (AvailableDiskSpace)
|
||||||
{
|
{
|
||||||
// caller requesting maximum size
|
// caller requesting maximum size
|
||||||
// we use maxVolumeSize because it is guaranteed to be less or equal to AvailableDiskSpace for outer volumes
|
// Limit "max" to available disk space even when --no-size-check allows explicit sparse sizes beyond it.
|
||||||
options->Size = maxVolumeSize;
|
options->Size = VC_MIN (maxVolumeSize, AvailableDiskSpace);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user