diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-03-15 14:49:37 +0900 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-03-15 14:49:37 +0900 |
| commit | 34eb338153bfee607fdeabbf20602e6c645d3794 (patch) | |
| tree | c7dfa590414a1b86a789a820b2d033d575a7152c /libarchive/archive_read_support_format_cab.c | |
| parent | aa50f8f4b0128112a58614838bbcbfc50b054f96 (diff) | |
| download | libarchive-34eb338153bfee607fdeabbf20602e6c645d3794.tar.gz | |
Issue 249: Uncompressed CAB fails to read subfile when archive has certain structure.
Diffstat (limited to 'libarchive/archive_read_support_format_cab.c')
| -rw-r--r-- | libarchive/archive_read_support_format_cab.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c index d822acec..d1ecd27b 100644 --- a/libarchive/archive_read_support_format_cab.c +++ b/libarchive/archive_read_support_format_cab.c @@ -1794,9 +1794,8 @@ cab_consume_cfdata(struct archive_read *a, int64_t consumed_bytes) rbytes -= cbytes; if (cfdata->uncompressed_avail == 0 && - (cab->entry_cffolder->comptype == COMPTYPE_NONE || - cab->entry_cffile->folder == iFoldCONTINUED_PREV_AND_NEXT || - cab->entry_cffile->folder == iFoldCONTINUED_FROM_PREV)) { + (cab->entry_cffile->folder == iFoldCONTINUED_PREV_AND_NEXT || + cab->entry_cffile->folder == iFoldCONTINUED_FROM_PREV)) { /* We have not read any data yet. */ if (cbytes == cfdata->uncompressed_bytes_remaining) { /* Skip whole current CFDATA. */ |