Skip to content

zipio: CRC fallback accepts a file longer than the first load chunk #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sevdestruct wants to merge 1 commit into
base: master
Choose a base branch
from
Open

zipio: CRC fallback accepts a file longer than the first load chunk #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/zipio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,13 @@ uint8_t *nc_zipset_read(nc_zipset *zs, const char *name, uint32_t crc,
mz_zip_archive_file_stat st;
if (!mz_zip_reader_file_stat(za, i, &st))
continue;
/* >=, not ==: expect_len is the FIRST load chunk, and a file
* loaded as LOAD + CONTINUE (mslug 201-p1, 2 MB in two 1 MB
* chunks) is longer than it. Under == the CRC pass could never
* match a renamed multi-chunk file, so a MAME 0.139 set whose
* 201-p1.bin is byte-identical to 201-p1.p1 was "missing". */
if ((uint32_t)st.m_crc32 == crc &&
(size_t)st.m_uncomp_size == expect_len)
(size_t)st.m_uncomp_size >= expect_len)
return extract(za, i, out_len, out_crc);
}
}
Expand Down