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

Static Code Analysis : fix usage of strncpy and sscanf.

Browse Source
This commit is contained in:
Mounir IDRASSI 2014-07-09 05:38:35 +02:00
parent 899a22b840
commit 9d027b02b9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Keyfiles.h
View File

@ -20,7 +20,7 @@ extern "C" {
typedef struct KeyFileStruct typedef struct KeyFileStruct
{ {
char FileName[MAX_PATH]; char FileName[MAX_PATH + 1];
struct KeyFileStruct *Next; struct KeyFileStruct *Next;
} KeyFile; } KeyFile;

2
src/Format/Tcformat.c
View File

@ -1699,7 +1699,7 @@ static BOOL GetDevicePathForHiddenOS (void)
try try
{ {
strncpy (szFileName, BootEncObj->GetPartitionForHiddenOS().DevicePath.c_str(), sizeof(szFileName)); strncpy (szFileName, BootEncObj->GetPartitionForHiddenOS().DevicePath.c_str(), sizeof(szFileName) - 1);
CreateFullVolumePath (szDiskFile, szFileName, &tmpbDevice); CreateFullVolumePath (szDiskFile, szFileName, &tmpbDevice);
} }

12
src/Mount/Mount.c
View File

@ -783,7 +783,7 @@ BOOL CheckSysEncMountWithoutPBA (const char *devicePath, BOOL quiet)
} }
} }
else else
strncpy (szDevicePath, devicePath, sizeof (szDevicePath)); strncpy (szDevicePath, devicePath, sizeof (szDevicePath) - 1);
char *partionPortion = strrchr (szDevicePath, '\\'); char *partionPortion = strrchr (szDevicePath, '\\');
@ -1866,7 +1866,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
return 0; return 0;
} }
static char PasswordDlgVolume[MAX_PATH]; static char PasswordDlgVolume[MAX_PATH + 1];
static BOOL PasswordDialogDisableMountOptions; static BOOL PasswordDialogDisableMountOptions;
static char *PasswordDialogTitleStringId; static char *PasswordDialogTitleStringId;
@ -6700,7 +6700,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
KeyFile *kf; KeyFile *kf;
RelativePath2Absolute (tmpPath); RelativePath2Absolute (tmpPath);
kf = (KeyFile *) malloc (sizeof (KeyFile)); kf = (KeyFile *) malloc (sizeof (KeyFile));
strncpy (kf->FileName, tmpPath, sizeof (kf->FileName)); strncpy (kf->FileName, tmpPath, sizeof (kf->FileName) - 1);
FirstCmdKeyFile = KeyFileAdd (FirstCmdKeyFile, kf); FirstCmdKeyFile = KeyFileAdd (FirstCmdKeyFile, kf);
} }
break; break;
@ -7750,7 +7750,7 @@ int RestoreVolumeHeader (HWND hwndDlg, char *lpszVolume)
// Open the volume using backup header // Open the volume using backup header
while (TRUE) while (TRUE)
{ {
strncpy (PasswordDlgVolume, lpszVolume, sizeof (PasswordDlgVolume)); strncpy (PasswordDlgVolume, lpszVolume, sizeof (PasswordDlgVolume) - 1);
if (!AskVolumePassword (hwndDlg, &VolumePassword, NULL, FALSE)) if (!AskVolumePassword (hwndDlg, &VolumePassword, NULL, FALSE))
{ {
nStatus = ERR_SUCCESS; nStatus = ERR_SUCCESS;
@ -8821,7 +8821,7 @@ void AnalyzeKernelMiniDump (HWND hwndDlg)
} }
uint64 bugcheckCode; uint64 bugcheckCode;
int n = sscanf (output.substr (p + 14, 8).c_str(), "%I64X", &bugcheckCode); int n = sscanf (output.substr (p + 14, 8).c_str(), "%I64uX", &bugcheckCode);
if (n != 1) if (n != 1)
{ {
Error ("ERR_PARAMETER_INCORRECT"); Error ("ERR_PARAMETER_INCORRECT");
@ -8831,7 +8831,7 @@ void AnalyzeKernelMiniDump (HWND hwndDlg)
p = output.find ("Arguments ", p); p = output.find ("Arguments ", p);
uint64 bugcheckArgs[4]; uint64 bugcheckArgs[4];
n = sscanf (output.substr (p + 10, (Is64BitOs() ? 17 : 9) * 4).c_str(), "%I64X %I64X %I64X %I64X", &bugcheckArgs[0], &bugcheckArgs[1], &bugcheckArgs[2], &bugcheckArgs[3]); n = sscanf (output.substr (p + 10, (Is64BitOs() ? 17 : 9) * 4).c_str(), "%I64uX %I64uX %I64uX %I64uX", &bugcheckArgs[0], &bugcheckArgs[1], &bugcheckArgs[2], &bugcheckArgs[3]);
if (n != 4) if (n != 4)
{ {
Error ("ERR_PARAMETER_INCORRECT"); Error ("ERR_PARAMETER_INCORRECT");