From: Tim Kientzle <kientzle@acm.org>
Date: Thu, 18 Dec 2025 15:52:10 +0000 (-0800)
Subject: Merge pull request #2812 from AZero13/w
X-Git-Tag: v3.8.5~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32ff85bc334a81e0507f5085926771de7100419;p=thirdparty%2Flibarchive.git

Merge pull request #2812 from AZero13/w

Fix p == null copy paste error

(cherry picked from commit 6e77f521fa9dbb422b72435562821cba33797b47)
---

diff --git a/tar/write.c b/tar/write.c
index 9e6c97b58..4369bce7f 100644
--- a/tar/write.c
+++ b/tar/write.c
@@ -190,7 +190,6 @@ set_reader_options(struct bsdtar *bsdtar, struct archive *a)
 		char *p;
 		/* Set default write options. */
 		if ((p = malloc(module_len + opt_len)) == NULL)
-		if (p == NULL)
 			lafe_errc(1, errno, "Out of memory");
 		/* Prepend magic code to ignore options for
 		 * a format or filters which are not added to