diff options
Diffstat (limited to 'archival')
-rw-r--r-- | archival/libarchive/decompress_bunzip2.c | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_tar.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c index 42e2b4f88..4a2b668aa 100644 --- a/archival/libarchive/decompress_bunzip2.c +++ b/archival/libarchive/decompress_bunzip2.c | |||
@@ -654,7 +654,7 @@ static int read_bunzip(bunzip_data *bd, char *outbuf, int len) | |||
654 | /* Subtract the 1 copy we'd output anyway to get extras */ | 654 | /* Subtract the 1 copy we'd output anyway to get extras */ |
655 | --bd->writeCopies; | 655 | --bd->writeCopies; |
656 | } | 656 | } |
657 | } /* for(;;) */ | 657 | } /* for (;;) */ |
658 | 658 | ||
659 | /* Decompression of this input block completed successfully */ | 659 | /* Decompression of this input block completed successfully */ |
660 | bd->writeCRC = CRC = ~CRC; | 660 | bd->writeCRC = CRC = ~CRC; |
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c index d26868bf8..cc6f3f0ad 100644 --- a/archival/libarchive/get_header_tar.c +++ b/archival/libarchive/get_header_tar.c | |||
@@ -147,11 +147,13 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g | |||
147 | #endif | 147 | #endif |
148 | } | 148 | } |
149 | 149 | ||
150 | #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS | ||
150 | static void die_if_bad_fnamesize(off_t sz) | 151 | static void die_if_bad_fnamesize(off_t sz) |
151 | { | 152 | { |
152 | if ((uoff_t)sz > 0xfff) /* more than 4k?! no funny business please */ | 153 | if ((uoff_t)sz > 0xfff) /* more than 4k?! no funny business please */ |
153 | bb_simple_error_msg_and_die("bad archive"); | 154 | bb_simple_error_msg_and_die("bad archive"); |
154 | } | 155 | } |
156 | #endif | ||
155 | 157 | ||
156 | char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) | 158 | char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) |
157 | { | 159 | { |