From 5ebd79745d84faa9fb352ed2bc58931f37975d85 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 3 Jun 2014 09:08:15 +0200 Subject: Use calloc directly instead of combining malloc and ZeroMemory --- src/Common/Dlgcode.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/Common/Dlgcode.c') diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index ed8d608a..71293bcd 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -7404,7 +7404,7 @@ char *LoadFile (const char *fileName, DWORD *size) return NULL; *size = GetFileSize (h, NULL); - buf = (char *) malloc (*size + 1); + buf = (char *) calloc (*size + 1, 1); if (buf == NULL) { @@ -7412,8 +7412,6 @@ char *LoadFile (const char *fileName, DWORD *size) return NULL; } - ZeroMemory (buf, *size + 1); - if (!ReadFile (h, buf, *size, size, NULL)) { free (buf); @@ -7444,18 +7442,15 @@ char *LoadFileBlock (char *fileName, __int64 fileOffset, size_t count) return NULL; } - buf = (char *) malloc (count); + buf = (char *) calloc (count, 1); if (buf == NULL) { CloseHandle (h); return NULL; } - - ZeroMemory (buf, count); - if (buf != NULL) - ReadFile (h, buf, count, &bytesRead, NULL); + ReadFile (h, buf, count, &bytesRead, NULL); CloseHandle (h); -- cgit v1.2.3