From b75e60124dd3d718ce649a419dc6fe5abccc513d Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 24 Nov 2013 13:00:06 +0000 Subject: (svn r26082) -Fix [FS#5816] (r26077): tar files with more than one file in the root directory would not be read properly (zydeco) --- src/fileio.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/fileio.cpp b/src/fileio.cpp index 1b773f0e8..a6cb85d74 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -761,7 +761,7 @@ bool TarScanner::AddFile(const char *filename, size_t basepath_length, const cha TarHeader th; char buf[sizeof(th.name) + 1], *end; - char name[sizeof(th.prefix) + 1 + sizeof(th.name) + 1] = ""; + char name[sizeof(th.prefix) + 1 + sizeof(th.name) + 1]; char link[sizeof(th.linkname) + 1]; char dest[sizeof(th.prefix) + 1 + sizeof(th.name) + 1 + 1 + sizeof(th.linkname) + 1]; size_t num = 0, pos = 0; @@ -784,6 +784,8 @@ bool TarScanner::AddFile(const char *filename, size_t basepath_length, const cha return false; } + name[0] = '\0'; + /* The prefix contains the directory-name */ if (th.prefix[0] != '\0') { ttd_strlcpy(name, th.prefix, lengthof(name)); -- cgit v1.2.3-54-g00ecf