diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-10 11:52:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-10 11:52:42 +0200 |
| commit | bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7 (patch) | |
| tree | 72672bb0c187b93f1fba99012cf0c4e716214298 /include | |
| parent | 0cf64c8b5d86d603903397bfce87dea5a862caec (diff) | |
| download | busybox-w32-bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7.tar.gz busybox-w32-bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7.tar.bz2 busybox-w32-bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7.zip | |
libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1
function old new delta
unsafe_symlink_target - 147 +147
unzip_main 2711 2732 +21
copy_file 1657 1678 +21
tar_main 999 971 -28
data_extract_all 1038 984 -54
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 2/2 up/down: 189/-82) Total: 107 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/bb_archive.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/bb_archive.h b/include/bb_archive.h index d3762415f..d3a02cf18 100644 --- a/include/bb_archive.h +++ b/include/bb_archive.h | |||
| @@ -64,9 +64,6 @@ typedef struct archive_handle_t { | |||
| 64 | /* Currently processed file's header */ | 64 | /* Currently processed file's header */ |
| 65 | file_header_t *file_header; | 65 | file_header_t *file_header; |
| 66 | 66 | ||
| 67 | /* List of symlink placeholders */ | ||
| 68 | llist_t *symlink_placeholders; | ||
| 69 | |||
| 70 | /* Process the header component, e.g. tar -t */ | 67 | /* Process the header component, e.g. tar -t */ |
| 71 | void FAST_FUNC (*action_header)(const file_header_t *); | 68 | void FAST_FUNC (*action_header)(const file_header_t *); |
| 72 | 69 | ||
| @@ -200,6 +197,7 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC; | |||
| 200 | void seek_by_read(int fd, off_t amount) FAST_FUNC; | 197 | void seek_by_read(int fd, off_t amount) FAST_FUNC; |
| 201 | 198 | ||
| 202 | const char *strip_unsafe_prefix(const char *str) FAST_FUNC; | 199 | const char *strip_unsafe_prefix(const char *str) FAST_FUNC; |
| 200 | int unsafe_symlink_target(const char *target) FAST_FUNC; | ||
| 203 | 201 | ||
| 204 | void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; | 202 | void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; |
| 205 | const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; | 203 | const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; |