Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Mar 2020 15:01:13 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r359211 - stable/12/tests/sys/fs/fusefs
Message-ID:  <202003221501.02MF1DL7054532@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: asomers
Date: Sun Mar 22 15:01:13 2020
New Revision: 359211
URL: https://svnweb.freebsd.org/changeset/base/359211

Log:
  MFC r357835:
  
  fusefs: fix some memory leaks in the tests.
  
  Oddly, most of these were not detected by Coverity.
  
  Reported by:	Coverity (one of them, anyway)
  Coverity CID:	1404490

Modified:
  stable/12/tests/sys/fs/fusefs/read.cc
  stable/12/tests/sys/fs/fusefs/write.cc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/tests/sys/fs/fusefs/read.cc
==============================================================================
--- stable/12/tests/sys/fs/fusefs/read.cc	Sun Mar 22 12:57:49 2020	(r359210)
+++ stable/12/tests/sys/fs/fusefs/read.cc	Sun Mar 22 15:01:13 2020	(r359211)
@@ -778,6 +778,7 @@ TEST_F(Read, cache_block)
 	ASSERT_EQ(bufsize, read(fd, buf, bufsize)) << strerror(errno);
 	ASSERT_EQ(0, memcmp(buf, contents1, bufsize));
 	leak(fd);
+	free(contents);
 }
 
 /* Reading with sendfile should work (though it obviously won't be 0-copy) */
@@ -899,6 +900,8 @@ TEST_P(ReadAhead, readahead) {
 	ASSERT_EQ(0, memcmp(rbuf, contents, bufsize));
 
 	leak(fd);
+	free(rbuf);
+	free(contents);
 }
 
 INSTANTIATE_TEST_CASE_P(RA, ReadAhead,

Modified: stable/12/tests/sys/fs/fusefs/write.cc
==============================================================================
--- stable/12/tests/sys/fs/fusefs/write.cc	Sun Mar 22 12:57:49 2020	(r359210)
+++ stable/12/tests/sys/fs/fusefs/write.cc	Sun Mar 22 15:01:13 2020	(r359211)
@@ -300,6 +300,8 @@ TEST_F(Write, append_to_cached)
 	/* Write the new data.  There should be no more read operations */
 	ASSERT_EQ(BUFSIZE, write(fd, CONTENTS, BUFSIZE)) << strerror(errno);
 	leak(fd);
+	free(oldbuf);
+	free(oldcontents);
 }
 
 TEST_F(Write, append_direct_io)
@@ -782,6 +784,8 @@ TEST_F(WriteCluster, clustering)
 			<< strerror(errno);
 	}
 	close(fd);
+	free(wbuf2x);
+	free(wbuf);
 }
 
 /* 
@@ -825,6 +829,7 @@ TEST_F(WriteCluster, DISABLED_cluster_write_err)
 			<< strerror(errno);
 	}
 	close(fd);
+	free(wbuf);
 }
 
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003221501.02MF1DL7054532>