[Toybox] [PATCH 2/2] tar: fix bugs with adding hardlinks to archive
William Djupström
william at deepztream.com
Tue Jun 9 06:56:25 PDT 2020
---
toys/posix/tar.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/toys/posix/tar.c b/toys/posix/tar.c
index 8706ac30..d752acfe 100644
--- a/toys/posix/tar.c
+++ b/toys/posix/tar.c
@@ -246,7 +246,8 @@ static int add_to_tar(struct dirtree *node)
i = 1;
} else {
// first time we've seen it. Store as normal file, but remember it.
- if (!(TT.hlc&255)) TT.hlx = xrealloc(TT.hlx, TT.hlc+256);
+ if (!(TT.hlc&255))
+ TT.hlx = xrealloc(TT.hlx, sizeof(*TT.hlx)*(TT.hlc+256));
TT.hlx[TT.hlc].arg = xstrdup(hname);
TT.hlx[TT.hlc].ino = st->st_ino;
TT.hlx[TT.hlc].dev = st->st_dev;
@@ -270,7 +271,7 @@ static int add_to_tar(struct dirtree *node)
}
if (strlen(lnk) > sizeof(hdr.link)) write_longname(lnk, 'K');
strncpy(hdr.link, lnk, sizeof(hdr.link));
- if (i) free(lnk);
+ if (i==2) free(lnk);
} else if (S_ISREG(st->st_mode)) {
hdr.type = '0';
ITOO(hdr.size, st->st_size);
--
2.26.2
More information about the Toybox
mailing list