1 files changed, 2 insertions, 0 deletions
diff --git a/src/Format/InPlace.c b/src/Format/InPlace.c
index 4a16fd4f..f6166dab 100644
--- a/src/Format/InPlace.c
+++ b/src/Format/InPlace.c
@@ -57,70 +57,72 @@ using namespace VeraCrypt;
 #endif
 
 #define TC_MAX_NONSYS_INPLACE_ENC_WORK_CHUNK_SIZE	(2048 * BYTES_PER_KB)
 #define TC_INITIAL_NTFS_CONCEAL_PORTION_SIZE		(2 * TC_MAX_VOLUME_SECTOR_SIZE)
 #define TC_NTFS_CONCEAL_CONSTANT	0xFF
 #define TC_NONSYS_INPLACE_ENC_HEADER_UPDATE_INTERVAL	(64 * BYTES_PER_MB)
 #define TC_NONSYS_INPLACE_ENC_MIN_VOL_SIZE			(TC_TOTAL_VOLUME_HEADERS_SIZE + TC_MIN_NTFS_FS_SIZE * 2)
 
 
 // If the returned value is greater than 0, it is the desired volume size in NTFS sectors (not in bytes)
 // after shrinking has been performed. If there's any error, returns -1.
 static __int64 NewFileSysSizeAfterShrink (HANDLE dev, const wchar_t *devicePath, int64 *totalClusterCount, DWORD *bytesPerCluster, BOOL silent)
 {
 	NTFS_VOLUME_DATA_BUFFER ntfsVolData;
 	DWORD nBytesReturned;
 	__int64 fileSysSize, desiredNbrSectors;
 
 	// Filesystem size and sector size
 
 	if (!DeviceIoControl (dev,
 		FSCTL_GET_NTFS_VOLUME_DATA,
 		NULL,
 		0,
 		(LPVOID) &ntfsVolData,
 		sizeof (ntfsVolData),
 		&nBytesReturned,
 		NULL))
 	{
 		if (!silent)
 			handleWin32Error (MainDlg, SRC_POS);
 
 		return -1;
 	}
 
 	if (	(ntfsVolData.NumberSectors.QuadPart <= 0)
+		||	(ntfsVolData.BytesPerSector == 0)
+		||	(ntfsVolData.BytesPerSector >= (DWORD) UINT_MAX)
 		||	(ntfsVolData.NumberSectors.QuadPart > (INT64_MAX / (__int64) ntfsVolData.BytesPerSector)) // overflow test
 		)
 	{
 		SetLastError (ERROR_INTERNAL_ERROR);
 		if (!silent)
 			handleWin32Error (MainDlg, SRC_POS);
 
 		return -1;
 	}
 
 	fileSysSize = ntfsVolData.NumberSectors.QuadPart * ntfsVolData.BytesPerSector;
 
 	desiredNbrSectors = (fileSysSize - TC_TOTAL_VOLUME_HEADERS_SIZE) / ntfsVolData.BytesPerSector;
 
 	if (desiredNbrSectors <= 0)
 		return -1;
 
 	if (totalClusterCount)
 		*totalClusterCount = ntfsVolData.TotalClusters.QuadPart;
 	if (bytesPerCluster)
 		*bytesPerCluster = ntfsVolData.BytesPerCluster;
 
 	return desiredNbrSectors;
 }
 
 
 BOOL CheckRequirementsForNonSysInPlaceEnc (HWND hwndDlg, const wchar_t *devicePath, BOOL silent)
 {
 	NTFS_VOLUME_DATA_BUFFER ntfsVolData;
 	DWORD nBytesReturned;
 	HANDLE dev;
 	WCHAR szFileSysName [256];
 	WCHAR devPath [MAX_PATH];
 	WCHAR dosDev [TC_MAX_PATH] = {0};
 	WCHAR devName [MAX_PATH] = {0};