libtar: fix handling of files bigger than 2 GiB
Change-Id: I96dc1b52b2e4edf366e70a927b263a9aab3e85b7
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
diff --git a/libtar/extract.c b/libtar/extract.c
index e605aca..4532b76 100644
--- a/libtar/extract.c
+++ b/libtar/extract.c
@@ -192,11 +192,11 @@
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 @@
#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 @@
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 @@
}
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)