github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2025-03-22 21:14:22 +01:00
Code Releases Activity

Refactor Windows file reading/writing

Browse Source
This commit is contained in:
Jukka Ojanen 2021-09-02 13:49:28 +03:00
parent 178003d692
commit b542d293b4
1 changed files with 62 additions and 61 deletions

123
src/filehandling.c

@ -25,6 +25,10 @@ _Static_assert(sizeof (size_t) == sizeof (SizeT), "Check why sizeof(size_t) != s
#define HCFILE_BUFFER_SIZE 256 * 1024 #define HCFILE_BUFFER_SIZE 256 * 1024
#endif #endif
#ifndef HCFILE_CHUNK_SIZE
#define HCFILE_CHUNK_SIZE 4 * 1024 * 1024
#endif
static bool xz_initialized = false; static bool xz_initialized = false;
static const ISzAlloc xz_alloc = { hc_lzma_alloc, hc_lzma_free }; static const ISzAlloc xz_alloc = { hc_lzma_alloc, hc_lzma_free };
@ -354,49 +358,48 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
{ {
size_t n = -1; size_t n = -1;
if (fp == NULL) return n; if (ptr == NULL || fp == NULL) return n;
if (ptr == NULL || size == 0 || nmemb == 0) return 0; if (size == 0 || nmemb == 0) return 0;
if (fp->pfp) if (fp->pfp)
{ {
#if defined (_WIN) #ifdef _WIN
u64 len = (u64) size * nmemb;
// 4 GB fread () limit for windows systems ? #ifndef _WIN64
// see: https://social.msdn.microsoft.com/Forums/vstudio/en-US/7c913001-227e-439b-bf07-54369ba07994/fwrite-issues-with-large-data-write /* check 2 GB limit with 32 bit build */
if (len >= INT32_MAX)
{
return n;
}
#endif
#define GIGABYTE (1024u * 1024u * 1024u) if (len <= HCFILE_CHUNK_SIZE)
if (((size * nmemb) / GIGABYTE) < 4)
{ {
n = fread (ptr, size, nmemb, fp->pfp); n = fread (ptr, size, nmemb, fp->pfp);
} }
else else
{ {
if ((size / GIGABYTE) > 3) return -1; size_t left = (size_t) len;
size_t pos = 0;
size_t elements_max = (3u * GIGABYTE) / size; /* assume success */
size_t elements_left = nmemb; n = nmemb;
size_t off = 0; do
n = 0;
while (elements_left > 0)
{ {
size_t elements_cur = elements_max; size_t chunk = (left > HCFILE_CHUNK_SIZE) ? HCFILE_CHUNK_SIZE : left;
size_t bytes = fread ((unsigned char *) ptr + pos, 1, chunk, fp->pfp);
if (elements_left < elements_max) elements_cur = elements_left; pos += bytes;
left -= bytes;
size_t ret = fread (ptr + off, size, elements_cur, fp->pfp); if (chunk != bytes)
{
if (ret != elements_cur) return -1; /* partial read */
n = pos / size;
n += ret; break;
off += ret * size; }
} while (left);
elements_left -= ret;
}
} }
#else #else
n = fread (ptr, size, nmemb, fp->pfp); n = fread (ptr, size, nmemb, fp->pfp);
@ -408,9 +411,11 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
} }
else if (fp->ufp) else if (fp->ufp)
{ {
unsigned s = size * nmemb; u64 len = (u64) size * nmemb;
if (len == (unsigned) len)
n = unzReadCurrentFile (fp->ufp, ptr, s); {
n = unzReadCurrentFile (fp->ufp, ptr, (unsigned) len);
}
} }
else if (fp->xfp) else if (fp->xfp)
{ {
@ -454,47 +459,43 @@ size_t hc_fwrite (const void *ptr, size_t size, size_t nmemb, HCFILE *fp)
{ {
size_t n = -1; size_t n = -1;
if (fp == NULL) return n; if (ptr == NULL || fp == NULL) return n;
if (size == 0 || nmemb == 0) return 0;
if (fp->pfp) if (fp->pfp)
{ {
#if defined (_WIN) #ifdef _WIN
u64 len = (u64) size * nmemb;
// 4 GB fwrite () limit for windows systems ? #ifndef _WIN64
// see: https://social.msdn.microsoft.com/Forums/vstudio/en-US/7c913001-227e-439b-bf07-54369ba07994/fwrite-issues-with-large-data-write /* check 2 GB limit with 32 bit build */
if (len >= INT32_MAX)
{
return n;
}
#endif
#define GIGABYTE (1024u * 1024u * 1024u) if (len <= HCFILE_CHUNK_SIZE)
if (((size * nmemb) / GIGABYTE) < 4)
{ {
n = fwrite (ptr, size, nmemb, fp->pfp); n = fwrite (ptr, size, nmemb, fp->pfp);
} }
else else
{ {
if ((size / GIGABYTE) > 3) return -1; size_t left = (size_t) len;
size_t pos = 0;
size_t elements_max = (3u * GIGABYTE) / size; /* assume success */
size_t elements_left = nmemb; n = nmemb;
size_t off = 0; do
n = 0;
while (elements_left > 0)
{ {
size_t elements_cur = elements_max; size_t chunk = (left > HCFILE_CHUNK_SIZE) ? HCFILE_CHUNK_SIZE : left;
size_t bytes = fwrite ((unsigned char *) ptr + pos, 1, chunk, fp->pfp);
if (elements_left < elements_max) elements_cur = elements_left; pos += bytes;
left -= bytes;
size_t ret = fwrite (ptr + off, size, elements_cur, fp->pfp); if (chunk != bytes) return -1;
} while (left);
if (ret != elements_cur) return -1;
n += ret;
off += ret * size;
elements_left -= ret;
}
} }
#else #else
n = fwrite (ptr, size, nmemb, fp->pfp); n = fwrite (ptr, size, nmemb, fp->pfp);
@ -623,7 +624,7 @@ int hc_fstat (HCFILE *fp, struct stat *buf)
{ {
/* check that the uncompressed size is known */ /* check that the uncompressed size is known */
const xzfile_t *xfp = fp->xfp; const xzfile_t *xfp = fp->xfp;
if (xfp->outSize != (UInt64)((Int64)-1)) if (xfp->outSize != (UInt64) ((Int64) -1))
{ {
buf->st_size = (off_t) xfp->outSize; buf->st_size = (off_t) xfp->outSize;
} }