<div dir="ltr">This bot is broken too: <a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/2015">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/2015</a></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 10, 2017 at 5:29 AM, Rafael Avila de Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Looks like the unit test has a leak:<br>
<br>
<a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/611/steps/check-llvm%20asan/logs/stdio" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/<wbr>builders/sanitizer-x86_64-<wbr>linux-bootstrap/builds/611/<wbr>steps/check-llvm%20asan/logs/<wbr>stdio</a><br>
<br>
Cheers,<br>
Rafael<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
Rui Ueyama via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> writes:<br>
<br>
> Author: ruiu<br>
> Date: Mon Jan 9 16:55:00 2017<br>
> New Revision: 291494<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=291494&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=291494&view=rev</a><br>
> Log:<br>
> TarWriter: Fix a bug in Ustar header.<br>
><br>
> If we split a filename into `Name` and `Prefix`, `Prefix` is at most<br>
> 145 bytes. We had a bug that didn't split a path correctly. This bug<br>
> was pointed out by Rafael in the post commit review.<br>
><br>
> This patch adds a unit test for TarWriter to verify the fix.<br>
><br>
> Added:<br>
> llvm/trunk/unittests/Support/<wbr>TarWriterTest.cpp<br>
> Modified:<br>
> llvm/trunk/lib/Support/<wbr>TarWriter.cpp<br>
> llvm/trunk/unittests/Support/<wbr>CMakeLists.txt<br>
><br>
> Modified: llvm/trunk/lib/Support/<wbr>TarWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/TarWriter.cpp?rev=291494&r1=291493&r2=291494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>Support/TarWriter.cpp?rev=<wbr>291494&r1=291493&r2=291494&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/lib/Support/<wbr>TarWriter.cpp (original)<br>
> +++ llvm/trunk/lib/Support/<wbr>TarWriter.cpp Mon Jan 9 16:55:00 2017<br>
> @@ -122,7 +122,7 @@ static void writePaxHeader(raw_fd_ostrea<br>
> static std::pair<StringRef, StringRef> splitPath(StringRef Path) {<br>
> if (Path.size() <= sizeof(UstarHeader::Name))<br>
> return {"", Path};<br>
> - size_t Sep = Path.rfind('/', sizeof(UstarHeader::Name) + 1);<br>
> + size_t Sep = Path.rfind('/', sizeof(UstarHeader::Prefix) + 1);<br>
> if (Sep == StringRef::npos)<br>
> return {"", Path};<br>
> return {Path.substr(0, Sep), Path.substr(Sep + 1)};<br>
><br>
> Modified: llvm/trunk/unittests/Support/<wbr>CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CMakeLists.txt?rev=291494&r1=291493&r2=291494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/unittests/<wbr>Support/CMakeLists.txt?rev=<wbr>291494&r1=291493&r2=291494&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/unittests/Support/<wbr>CMakeLists.txt (original)<br>
> +++ llvm/trunk/unittests/Support/<wbr>CMakeLists.txt Mon Jan 9 16:55:00 2017<br>
> @@ -43,10 +43,11 @@ add_llvm_unittest(SupportTests<br>
> SpecialCaseListTest.cpp<br>
> StringPool.cpp<br>
> SwapByteOrderTest.cpp<br>
> + TarWriterTest.cpp<br>
> TargetParserTest.cpp<br>
> - Threading.cpp<br>
> ThreadLocalTest.cpp<br>
> ThreadPool.cpp<br>
> + Threading.cpp<br>
> TimerTest.cpp<br>
> TypeNameTest.cpp<br>
> TrailingObjectsTest.cpp<br>
><br>
> Added: llvm/trunk/unittests/Support/<wbr>TarWriterTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/TarWriterTest.cpp?rev=291494&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/unittests/<wbr>Support/TarWriterTest.cpp?rev=<wbr>291494&view=auto</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/unittests/Support/<wbr>TarWriterTest.cpp (added)<br>
> +++ llvm/trunk/unittests/Support/<wbr>TarWriterTest.cpp Mon Jan 9 16:55:00 2017<br>
> @@ -0,0 +1,88 @@<br>
> +//===- llvm/unittest/Support/<wbr>TarWriterTest.cpp ----------------------------==<wbr>=//<br>
> +//<br>
> +// The LLVM Compiler Infrastructure<br>
> +//<br>
> +// This file is distributed under the University of Illinois Open Source<br>
> +// License. See LICENSE.TXT for details.<br>
> +//<br>
> +//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
> +<br>
> +#include "llvm/Support/FileSystem.h"<br>
> +#include "llvm/Support/MemoryBuffer.h"<br>
> +#include "llvm/Support/TarWriter.h"<br>
> +#include "gtest/gtest.h"<br>
> +<br>
> +using namespace llvm;<br>
> +namespace {<br>
> +<br>
> +struct UstarHeader {<br>
> + char Name[100];<br>
> + char Mode[8];<br>
> + char Uid[8];<br>
> + char Gid[8];<br>
> + char Size[12];<br>
> + char Mtime[12];<br>
> + char Checksum[8];<br>
> + char TypeFlag;<br>
> + char Linkname[100];<br>
> + char Magic[6];<br>
> + char Version[2];<br>
> + char Uname[32];<br>
> + char Gname[32];<br>
> + char DevMajor[8];<br>
> + char DevMinor[8];<br>
> + char Prefix[155];<br>
> + char Pad[12];<br>
> +};<br>
> +<br>
> +class TarWriterTest : public ::testing::Test {};<br>
> +<br>
> +static UstarHeader create(StringRef Base, StringRef Filename) {<br>
> + // Create a temporary file.<br>
> + SmallString<128> Path;<br>
> + std::error_code EC =<br>
> + sys::fs::createTemporaryFile("<wbr>TarWriterTest", "tar", Path);<br>
> + EXPECT_FALSE((bool)EC);<br>
> +<br>
> + // Create a tar file.<br>
> + Expected<std::unique_ptr<<wbr>TarWriter>> TarOrErr = TarWriter::create(Path, Base);<br>
> + EXPECT_TRUE((bool)TarOrErr);<br>
> + std::unique_ptr<TarWriter> Tar = std::move(*TarOrErr);<br>
> + Tar->append(Filename, "contents");<br>
> + Tar.release();<br>
> +<br>
> + // Read the tar file.<br>
> + ErrorOr<std::unique_ptr<<wbr>MemoryBuffer>> MBOrErr = MemoryBuffer::getFile(Path);<br>
> + EXPECT_TRUE((bool)MBOrErr);<br>
> + std::unique_ptr<MemoryBuffer> MB = std::move(*MBOrErr);<br>
> + sys::fs::remove(Path);<br>
> + return *reinterpret_cast<const UstarHeader *>(MB->getBufferStart());<br>
> +}<br>
> +<br>
> +TEST_F(TarWriterTest, Basics) {<br>
> + UstarHeader Hdr = create("base", "file");<br>
> + ASSERT_EQ("ustar", StringRef(Hdr.Magic));<br>
> + ASSERT_EQ("00", StringRef(Hdr.Version, 2));<br>
> + ASSERT_EQ("base/file", StringRef(Hdr.Name));<br>
> + ASSERT_EQ("00000000010", StringRef(Hdr.Size));<br>
> +}<br>
> +<br>
> +TEST_F(TarWriterTest, LongFilename) {<br>
> + UstarHeader Hdr1 = create(<br>
> + "012345678", std::string(99, 'x') + "/" + std::string(44, 'x') + "/foo");<br>
> + ASSERT_EQ("foo", StringRef(Hdr1.Name));<br>
> + ASSERT_EQ("012345678/" + std::string(99, 'x') + "/" + std::string(44, 'x'),<br>
> + StringRef(Hdr1.Prefix));<br>
> +<br>
> + UstarHeader Hdr2 = create(<br>
> + "012345678", std::string(99, 'x') + "/" + std::string(45, 'x') + "/foo");<br>
> + ASSERT_EQ("foo", StringRef(Hdr2.Name));<br>
> + ASSERT_EQ("012345678/" + std::string(99, 'x') + "/" + std::string(45, 'x'),<br>
> + StringRef(Hdr2.Prefix));<br>
> +<br>
> + UstarHeader Hdr3 = create(<br>
> + "012345678", std::string(99, 'x') + "/" + std::string(46, 'x') + "/foo");<br>
> + ASSERT_EQ(std::string(46, 'x') + "/foo", StringRef(Hdr3.Name));<br>
> + ASSERT_EQ("012345678/" + std::string(99, 'x'), StringRef(Hdr3.Prefix));<br>
> +}<br>
> +}<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>