Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Use calloc directly instead of combining malloc and ZeroMemory

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-06-03 09:08:15 +02:00
parent 1763e8a2ba
commit 5ebd79745d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Common/Dlgcode.c
View File

@@ -7404,7 +7404,7 @@ char *LoadFile (const char *fileName, DWORD *size)
return NULL; return NULL;
*size = GetFileSize (h, NULL); *size = GetFileSize (h, NULL);
buf = (char *) malloc (*size + 1); buf = (char *) calloc (*size + 1, 1);
if (buf == NULL) if (buf == NULL)
{ {
@@ -7412,8 +7412,6 @@ char *LoadFile (const char *fileName, DWORD *size)
return NULL; return NULL;
} }
ZeroMemory (buf, *size + 1);
if (!ReadFile (h, buf, *size, size, NULL)) if (!ReadFile (h, buf, *size, size, NULL))
{ {
free (buf); free (buf);
@@ -7444,18 +7442,15 @@ char *LoadFileBlock (char *fileName, __int64 fileOffset, size_t count)
return NULL; return NULL;
} }
buf = (char *) malloc (count); buf = (char *) calloc (count, 1);
if (buf == NULL) if (buf == NULL)
{ {
CloseHandle (h); CloseHandle (h);
return NULL; return NULL;
} }
ZeroMemory (buf, count);
if (buf != NULL) ReadFile (h, buf, count, &bytesRead, NULL);
ReadFile (h, buf, count, &bytesRead, NULL);
CloseHandle (h); CloseHandle (h);