nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-28 14:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Static Code Analysis: handle unused variables more properly. Catch STL exception. Add more checks. Add proper cast to arithmetic operations.

Browse Source
This commit is contained in:
Mounir IDRASSI 2015-02-08 23:36:01 +01:00
parent 1ab00f3e3c
commit de0c30dded
10 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Cmdline.c
View File

@ -27,8 +27,8 @@
not. - see DialogProc */
BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (lParam); /* remove warning */
if (wParam); /* remove warning */
UNREFERENCED_PARAMETER (lParam); /* remove warning */
UNREFERENCED_PARAMETER (wParam); /* remove warning */
switch (msg)
{

2
src/Common/Combo.c
View File

@ -157,7 +157,7 @@ void LoadCombo (HWND hComboBox)
void DumpCombo (HWND hComboBox, int bClear)
{
FILE *f;
int i, nComboIdx[SIZEOF_MRU_LIST];
int i, nComboIdx[SIZEOF_MRU_LIST] = {0};
if (bClear)
{

12
src/Common/Dictionary.c
View File

@ -22,11 +22,15 @@ static size_t DataPoolSize = 0;
void AddDictionaryEntry (char *key, int intKey, void *value)
{
if (key)
StringKeyMap[key] = value;
try
{
if (key)
StringKeyMap[key] = value;
if (intKey != 0)
IntKeyMap[intKey] = value;
if (intKey != 0)
IntKeyMap[intKey] = value;
}
catch (exception&) {}
}

9
src/Common/Fat.c
View File

@ -60,7 +60,7 @@ GetFatParams (fatparams * ft)
if (ft->cluster_size == 0)
ft->cluster_size = 1;
if (ft->cluster_size * ft->sector_size > TC_MAX_FAT_CLUSTER_SIZE)
if (((unsigned __int64) ft->cluster_size * ft->sector_size) > TC_MAX_FAT_CLUSTER_SIZE)
ft->cluster_size = TC_MAX_FAT_CLUSTER_SIZE / ft->sector_size;
if (ft->cluster_size > 128)
@ -85,7 +85,7 @@ GetFatParams (fatparams * ft)
ft->size_fat = 12;
ft->reserved = 2;
fatsecs = ft->num_sectors - (ft->size_root_dir + ft->sector_size - 1) / ft->sector_size - ft->reserved;
ft->cluster_count = (int) (((__int64) fatsecs * ft->sector_size) / (ft->cluster_size * ft->sector_size));
ft->cluster_count = (int) (((unsigned __int64) fatsecs * ft->sector_size) / ((unsigned __int64) ft->cluster_size * ft->sector_size));
ft->fat_length = (((ft->cluster_count * 3 + 1) >> 1) + ft->sector_size - 1) / ft->sector_size;
if (ft->cluster_count >= 4085) // FAT16
@ -108,7 +108,7 @@ GetFatParams (fatparams * ft)
fatsecs = ft->num_sectors - ft->reserved;
ft->size_root_dir = ft->cluster_size * ft->sector_size;
ft->cluster_count = (int) (((__int64) fatsecs * ft->sector_size) / (ft->cluster_size * ft->sector_size));
ft->cluster_count = (int) (((unsigned __int64) fatsecs * ft->sector_size) / (ft->cluster_size * ft->sector_size));
ft->fat_length = (ft->cluster_count * 4 + ft->sector_size - 1) / ft->sector_size;
// Align data area on TC_MAX_VOLUME_SECTOR_SIZE
@ -282,7 +282,8 @@ FormatFat (void* hwndDlgPtr, unsigned __int64 startSector, fatparams * ft, void
memset (sector, 0, ft->sector_size);
RandgetBytes (hwndDlg, ft->volume_id, sizeof (ft->volume_id), FALSE);
if (!RandgetBytes (hwndDlg, ft->volume_id, sizeof (ft->volume_id), FALSE))
goto fail;
PutBoot (ft, (unsigned char *) sector);
if (WriteSector (dev, sector, write_buf, &write_buf_cnt, &nSecNo,

2
src/Common/Fat.h
View File

@ -19,7 +19,7 @@ typedef struct fatparams_t
int size_fat; /* size of FAT */
int fats;
int media;
int cluster_size;
unsigned int cluster_size;
int fat_length;
uint16 dir_entries;
uint16 sector_size;

2
src/Common/Format.h
View File

@ -33,7 +33,7 @@ typedef struct
int pkcs5;
uint32 headerFlags;
int fileSystem;
int clusterSize;
unsigned int clusterSize;
BOOL sparseFileSwitch;
BOOL quickFormat;
int sectorSize;

5
src/Common/Language.c
View File

@ -64,6 +64,7 @@ static char *MapNextLanguageFile ()
WIN32_FIND_DATAW find;
HANDLE file;
DWORD read;
BOOL bStatus;
if (LanguageFileFindHandle == INVALID_HANDLE_VALUE)
{
@ -107,9 +108,9 @@ static char *MapNextLanguageFile ()
return NULL;
}
ReadFile (file, LanguageFileBuffer, find.nFileSizeLow, &read, NULL);
bStatus = ReadFile (file, LanguageFileBuffer, find.nFileSizeLow, &read, NULL);
CloseHandle (file);
if (read != find.nFileSizeLow)
if (!bStatus || (read != find.nFileSizeLow))
{
free(LanguageFileBuffer);
return NULL;

2
src/Common/Password.c
View File

@ -32,7 +32,7 @@ void VerifyPasswordAndUpdate (HWND hwndDlg, HWND hButton, HWND hPassword,
int k = GetWindowTextLength (hPassword);
BOOL bEnable = FALSE;
if (hwndDlg); /* Remove warning */
UNREFERENCED_PARAMETER (hwndDlg); /* Remove warning */
GetWindowText (hPassword, szTmp1, sizeof (szTmp1));
GetWindowText (hVerify, szTmp2, sizeof (szTmp2));

2
src/Common/Random.c
View File

@ -534,7 +534,7 @@ LRESULT CALLBACK KeyboardProc (int nCode, WPARAM wParam, LPARAM lParam)
/* This is the thread function which will poll the system for randomness */
static unsigned __stdcall PeriodicFastPollThreadProc (void *dummy)
{
if (dummy); /* Remove unused parameter warning */
UNREFERENCED_PARAMETER (dummy); /* Remove unused parameter warning */
for (;;)
{

1
src/ExpandVolume/WinMain.cpp
View File

@ -817,7 +817,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
{
static UINT taskBarCreatedMsg;
WORD lw = LOWORD (wParam);
WORD hw = HIWORD (wParam);
switch (uMsg)
{