X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ff94be47f5dbdcf99cea23fad8c9b992a8e5a67e..3d8232bf97ce11818fb07813a71136484ea1a44a:/test/libapt/file-helpers.cc

diff --git a/test/libapt/file-helpers.cc b/test/libapt/file-helpers.cc
index 5edb9a9fe..387192868 100644
--- a/test/libapt/file-helpers.cc
+++ b/test/libapt/file-helpers.cc
@@ -53,20 +53,19 @@ void helperCreateLink(std::string const &dir, std::string const &targetname, std
    link.append(linkname);
    ASSERT_EQ(0, symlink(target.c_str(), link.c_str()));
 }
-void helperCreateTemporaryFile(std::string const &id, FileFd &fd, char * * const filename, char const * const content)
+void helperCreateTemporaryFile(std::string const &id, FileFd &fd, std::string * const filename, char const * const content)
 {
    std::string name("apt-test-");
    name.append(id).append(".XXXXXXXX");
    char * tempfile = strdup(name.c_str());
+   ASSERT_STRNE(NULL, tempfile);
    int tempfile_fd = mkstemp(tempfile);
    ASSERT_NE(-1, tempfile_fd);
    if (filename != NULL)
       *filename = tempfile;
    else
-   {
       unlink(tempfile);
-      free(tempfile);
-   }
+   free(tempfile);
 
    EXPECT_TRUE(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite));
    if (content != NULL)