Skip to content

Add reading coffFiles field in a CAB file header to find an offset of the first CFILE entry #56

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

Closed
vba-yulia-siniakovich wants to merge 1 commit into from
Closed

Add reading coffFiles field in a CAB file header to find an offset of the first CFILE entry #56

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
9 changes: 9 additions & 0 deletions libmspack/mspack/cabd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ static int cabd_read_headers(struct mspack_system *sys,
cab->base.set_id = EndGetI16(&buf[cfhead_SetID]);
cab->base.set_index = EndGetI16(&buf[cfhead_CabinetIndex]);

unsigned long long cfile_offset = (unsigned long long) EndGetI32(&buf[cfhead_FileOffset]);

/* get the number of folders */
num_folders = EndGetI16(&buf[cfhead_NumFolders]);
if (num_folders == 0) {
Expand Down Expand Up @@ -439,6 +441,13 @@ static int cabd_read_headers(struct mspack_system *sys,
linkfol = fol;
}

if ((unsigned long long)(sys->tell(fh) - cab->base.base_offset) < cfile_offset
&& cfile_offset < (unsigned long long)cab->base.length) {
if (sys->seek(fh, cfile_offset, MSPACK_SYS_SEEK_START)) {
return MSPACK_ERR_SEEK;
}
}

/* read files */
for (i = 0; i < num_files; i++) {
if (sys->read(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
Expand Down