From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 5 Oct 2014 01:12:04 +0000 (+0900)
Subject: Fix the potential of memory leaks in our test suit, which
X-Git-Tag: v3.1.900a~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd7d2b8d9349a39a024cf125cc653404577b290d;p=thirdparty%2Flibarchive.git

Fix the potential of memory leaks in our test suit, which
Xcode Analyzer pointed out.
---

diff --git a/libarchive/test/test_write_disk_appledouble.c b/libarchive/test/test_write_disk_appledouble.c
index d604fbf2d..4f1850b3d 100644
--- a/libarchive/test/test_write_disk_appledouble.c
+++ b/libarchive/test/test_write_disk_appledouble.c
@@ -48,8 +48,8 @@ has_xattr(const char *filename, const char *xattrname)
 	if (r == 0)
 		return (0);
 
-	nl = malloc(r);
-	if (!assert(nl != NULL))
+	assert((nl = malloc(r)) != NULL);
+	if (nl == NULL)
 		return (0);
 
 	r = listxattr(filename, nl, r, XATTR_SHOWCOMPRESSION);
diff --git a/libarchive/test/test_write_disk_hfs_compression.c b/libarchive/test/test_write_disk_hfs_compression.c
index 24c13c4ed..2960fe2ed 100644
--- a/libarchive/test/test_write_disk_hfs_compression.c
+++ b/libarchive/test/test_write_disk_hfs_compression.c
@@ -45,8 +45,8 @@ has_xattr(const char *filename, const char *xattrname)
 	if (r == 0)
 		return (0);
 
-	nl = malloc(r);
-	if (!assert(nl != NULL))
+	assert((nl = malloc(r)) != NULL);
+	if (nl == NULL)
 		return (0);
 
 	r = listxattr(filename, nl, r, XATTR_SHOWCOMPRESSION);
diff --git a/libarchive/test/test_write_disk_mac_metadata.c b/libarchive/test/test_write_disk_mac_metadata.c
index f9e47d659..b834a58ed 100644
--- a/libarchive/test/test_write_disk_mac_metadata.c
+++ b/libarchive/test/test_write_disk_mac_metadata.c
@@ -48,8 +48,8 @@ has_xattr(const char *filename, const char *xattrname)
 	if (r == 0)
 		return (0);
 
-	nl = malloc(r);
-	if (!assert(nl != NULL))
+	assert((nl = malloc(r)) != NULL);
+	if (nl == NULL)
 		return (0);
 
 	r = listxattr(filename, nl, r, XATTR_SHOWCOMPRESSION);
diff --git a/libarchive/test/test_write_disk_no_hfs_compression.c b/libarchive/test/test_write_disk_no_hfs_compression.c
index a1afb9bb2..b7210e204 100644
--- a/libarchive/test/test_write_disk_no_hfs_compression.c
+++ b/libarchive/test/test_write_disk_no_hfs_compression.c
@@ -45,8 +45,8 @@ has_xattr(const char *filename, const char *xattrname)
 	if (r == 0)
 		return (0);
 
-	nl = malloc(r);
-	if (!assert(nl != NULL))
+	assert((nl = malloc(r)) != NULL);
+	if (nl == NULL)
 		return (0);
 
 	r = listxattr(filename, nl, r, XATTR_SHOWCOMPRESSION);