arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-23 00:28:11 +00:00
Code Issues Releases Wiki Activity

Refactor xz file reading

Browse Source
This commit is contained in:
Jukka Ojanen 2021-09-02 15:16:19 +03:00
parent 63cc905bbc
commit e6c89040fe
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/filehandling.c
View File

@ -356,7 +356,7 @@ bool hc_fopen_raw (HCFILE *fp, const char *path, const char *mode)
size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
{
size_t n = -1;
size_t n = (size_t) -1;
if (ptr == NULL || fp == NULL) return n;
@ -421,7 +421,7 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
{
unsigned chunk = (len > HCFILE_CHUNK_SIZE) ? HCFILE_CHUNK_SIZE : (unsigned) len;
int result = unzReadCurrentFile (fp->ufp, (unsigned char *) ptr + pos, chunk);
if (result < 0) return -1;
if (result < 0) return (size_t) -1;
pos += (u64) result;
len -= (u64) result;
if (chunk != (unsigned) result)
@ -440,6 +440,9 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
SRes res = SZ_OK;
xzfile_t *xfp = fp->xfp;
/* assume success */
n = nmemb;
do
{
/* fill buffer if needed */
@ -458,13 +461,16 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
res = XzUnpacker_Code (&xfp->state, outBuf + outPos, &outLeft, xfp->inBuf + xfp->inPos, &inLeft, inLeft == 0, CODER_FINISH_ANY, &status);
xfp->inPos += inLeft;
xfp->inProcessed += inLeft;
if (res != SZ_OK) return -1;
if (inLeft == 0 && outLeft == 0) break;
if (res != SZ_OK) return (size_t) -1;
if (inLeft == 0 && outLeft == 0)
{
/* partial read */
n = (size_t) (outPos / size);
break;
}
outPos += outLeft;
xfp->outProcessed += outLeft;
} while (outPos < outLen);
n = outPos;
}
return n;