From: Tobias Stoeckmann <stoeckmann@users.noreply.github.com>
Date: Tue, 19 May 2026 15:19:06 +0000 (+0200)
Subject: Merge pull request #3027 from stoeckmann/xar_debug
X-Git-Tag: v3.8.8~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ba63aef60bf3c452aee93063b9abd6e29f96302;p=thirdparty%2Flibarchive.git

Merge pull request #3027 from stoeckmann/xar_debug

xar: Do not modify variables in DEBUG block
(cherry picked from commit fd182c5ba56cff54d6963c3928ca4d9f363b9ff9)
---

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index b3836e4f0..0bc3862f8 100644
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -2691,11 +2691,12 @@ xml_data(void *userData, const char *s, size_t len)
 #if DEBUG
 	{
 		char buff[1024];
-		if (len > (int)(sizeof(buff)-1))
-			len = (int)(sizeof(buff)-1);
-		strncpy(buff, s, len);
-		buff[len] = 0;
-		fprintf(stderr, "\tlen=%d:\"%s\"\n", len, buff);
+		size_t dlen = len;
+		if (dlen > sizeof(buff) - 1)
+			dlen = sizeof(buff) - 1;
+		strncpy(buff, s, dlen);
+		buff[dlen] = 0;
+		fprintf(stderr, "\tlen=%zu:\"%s\"\n", dlen, buff);
 	}
 #endif
 	switch (xar->xmlsts) {