From 78ab0c5807c17e343cc4fa9af86ea2d787e0e047 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Fri, 20 Mar 2015 15:34:45 +0100 Subject: libtar: fix handling of files bigger than 2 GiB Change-Id: I96dc1b52b2e4edf366e70a927b263a9aab3e85b7 Signed-off-by: Vojtech Bocek --- libtar/extract.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libtar/extract.c') diff --git a/libtar/extract.c b/libtar/extract.c index e605aca43..4532b7640 100644 --- a/libtar/extract.c +++ b/libtar/extract.c @@ -192,11 +192,11 @@ int tar_extract_regfile(TAR *t, char *realname, const int *progress_fd) { //mode_t mode; - size_t size; + size_t size, i; //uid_t uid; //gid_t gid; int fdout; - int i, k; + int k; char buf[T_BLOCKSIZE]; char *filename; @@ -261,7 +261,7 @@ tar_extract_regfile(TAR *t, char *realname, const int *progress_fd) #endif /* extract the file */ - for (i = size; i > 0; i -= T_BLOCKSIZE) + for (i = size; i > 0; i -= tar_min(i, T_BLOCKSIZE)) { k = tar_block_read(t, buf); if (k != T_BLOCKSIZE) @@ -298,8 +298,8 @@ tar_extract_regfile(TAR *t, char *realname, const int *progress_fd) int tar_skip_regfile(TAR *t) { - int i, k; - size_t size; + int k; + size_t size, i; char buf[T_BLOCKSIZE]; if (!TH_ISREG(t)) @@ -309,7 +309,7 @@ tar_skip_regfile(TAR *t) } size = th_get_size(t); - for (i = size; i > 0; i -= T_BLOCKSIZE) + for (i = size; i > 0; i -= tar_min(i, T_BLOCKSIZE)) { k = tar_block_read(t, buf); if (k != T_BLOCKSIZE) -- cgit v1.2.3