arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-27 18:32:36 +00:00
Code Issues Releases Wiki Activity

Refactor zip file reading

Browse Source
This commit is contained in:
Jukka Ojanen 2021-09-02 14:59:38 +03:00
parent b542d293b4
commit 63cc905bbc
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/filehandling.c
View File

@ -412,10 +412,25 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
else if (fp->ufp) else if (fp->ufp)
{ {
u64 len = (u64) size * nmemb; u64 len = (u64) size * nmemb;
if (len == (unsigned) len) u64 pos = 0;
/* assume success */
n = nmemb;
do
{ {
n = unzReadCurrentFile (fp->ufp, ptr, (unsigned) len); 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;
pos += (u64) result;
len -= (u64) result;
if (chunk != (unsigned) result)
{
/* partial read */
n = pos / size;
break;
}
} while (len);
} }
else if (fp->xfp) else if (fp->xfp)
{ {