From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 27 Dec 2025 18:28:27 +0000 (-0800)
Subject: Merge pull request #2830 from AZero13/return
X-Git-Tag: v3.8.5~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7ce6646610180f3acd37b571505edebcc458ee;p=thirdparty%2Flibarchive.git

Merge pull request #2830 from AZero13/return

return early if archive_write_set_format_shar fails

(cherry picked from commit d54b2241b907d12300f0a58ed0ff1b20172db489)
---

diff --git a/libarchive/archive_write_set_format_shar.c b/libarchive/archive_write_set_format_shar.c
index be9f78ce9..b18c78cec 100644
--- a/libarchive/archive_write_set_format_shar.c
+++ b/libarchive/archive_write_set_format_shar.c
@@ -144,7 +144,9 @@ archive_write_set_format_shar_dump(struct archive *_a)
 	struct archive_write *a = (struct archive_write *)_a;
 	struct shar *shar;
 
-	archive_write_set_format_shar(&a->archive);
+	int ret = archive_write_set_format_shar(&a->archive);
+	if (ret != ARCHIVE_OK)
+		return ret;
 	shar = (struct shar *)a->format_data;
 	shar->dump = 1;
 	a->format_write_data = archive_write_shar_data_uuencode;