|
 |
360332 |
From 6595e6491a472bc4e7f81ed7fe2879c67b3873fe Mon Sep 17 00:00:00 2001
|
|
|
360332 |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
360332 |
Date: Tue, 7 Feb 2012 13:50:55 +0100
|
|
|
360332 |
Subject: [PATCH] libtar - rhbz #785760
|
|
|
360332 |
|
|
|
360332 |
---
|
|
|
360332 |
lib/append.c | 14 ++++++++------
|
|
|
360332 |
lib/extract.c | 2 ++
|
|
|
360332 |
libtar/libtar.c | 3 +++
|
|
|
360332 |
3 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
360332 |
|
|
|
360332 |
diff --git a/lib/append.c b/lib/append.c
|
|
|
360332 |
index 5489168..690202b 100644
|
|
|
360332 |
--- a/lib/append.c
|
|
|
360332 |
+++ b/lib/append.c
|
|
|
360332 |
@@ -216,6 +216,7 @@ tar_append_regfile(TAR *t, char *realname)
|
|
|
360332 |
int filefd;
|
|
|
360332 |
int i, j;
|
|
|
360332 |
size_t size;
|
|
|
360332 |
+ int rv = -1;
|
|
|
360332 |
|
|
|
360332 |
filefd = open(realname, O_RDONLY);
|
|
|
360332 |
if (filefd == -1)
|
|
|
360332 |
@@ -234,25 +235,26 @@ tar_append_regfile(TAR *t, char *realname)
|
|
|
360332 |
{
|
|
|
360332 |
if (j != -1)
|
|
|
360332 |
errno = EINVAL;
|
|
|
360332 |
- return -1;
|
|
|
360332 |
+ goto fail;
|
|
|
360332 |
}
|
|
|
360332 |
if (tar_block_write(t, &block) == -1)
|
|
|
360332 |
- return -1;
|
|
|
360332 |
+ goto fail;
|
|
|
360332 |
}
|
|
|
360332 |
|
|
|
360332 |
if (i > 0)
|
|
|
360332 |
{
|
|
|
360332 |
j = read(filefd, &block, i);
|
|
|
360332 |
if (j == -1)
|
|
|
360332 |
- return -1;
|
|
|
360332 |
+ goto fail;
|
|
|
360332 |
memset(&(block[i]), 0, T_BLOCKSIZE - i);
|
|
|
360332 |
if (tar_block_write(t, &block) == -1)
|
|
|
360332 |
- return -1;
|
|
|
360332 |
+ goto fail;
|
|
|
360332 |
}
|
|
|
360332 |
|
|
|
360332 |
+ rv = 0;
|
|
|
360332 |
+fail:
|
|
|
360332 |
close(filefd);
|
|
|
360332 |
-
|
|
|
360332 |
- return 0;
|
|
|
360332 |
+ return rv;
|
|
|
360332 |
}
|
|
|
360332 |
|
|
|
360332 |
|
|
|
360332 |
diff --git a/lib/extract.c b/lib/extract.c
|
|
|
360332 |
index b783d87..b36d447 100644
|
|
|
360332 |
--- a/lib/extract.c
|
|
|
360332 |
+++ b/lib/extract.c
|
|
|
360332 |
@@ -245,6 +245,7 @@ tar_extract_regfile(TAR *t, char *realname)
|
|
|
360332 |
{
|
|
|
360332 |
if (k != -1)
|
|
|
360332 |
errno = EINVAL;
|
|
|
360332 |
+ close(fdout);
|
|
|
360332 |
free (pn);
|
|
|
360332 |
return -1;
|
|
|
360332 |
}
|
|
|
360332 |
@@ -253,6 +254,7 @@ tar_extract_regfile(TAR *t, char *realname)
|
|
|
360332 |
if (write(fdout, buf,
|
|
|
360332 |
((i > T_BLOCKSIZE) ? T_BLOCKSIZE : i)) == -1)
|
|
|
360332 |
{
|
|
|
360332 |
+ close(fdout);
|
|
|
360332 |
free (pn);
|
|
|
360332 |
return -1;
|
|
|
360332 |
}
|
|
|
360332 |
diff --git a/libtar/libtar.c b/libtar/libtar.c
|
|
|
360332 |
index 83564c8..673c90e 100644
|
|
|
360332 |
--- a/libtar/libtar.c
|
|
|
360332 |
+++ b/libtar/libtar.c
|
|
|
360332 |
@@ -83,7 +83,10 @@ gzopen_frontend(char *pathname, int oflags, int mode)
|
|
|
360332 |
return -1;
|
|
|
360332 |
|
|
|
360332 |
if ((oflags & O_CREAT) && fchmod(fd, mode))
|
|
|
360332 |
+ {
|
|
|
360332 |
+ close(fd);
|
|
|
360332 |
return -1;
|
|
|
360332 |
+ }
|
|
|
360332 |
|
|
|
360332 |
gzf = gzdopen(fd, gzoflags);
|
|
|
360332 |
if (!gzf)
|
|
|
360332 |
--
|
|
|
360332 |
1.7.1
|
|
|
360332 |
|