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 b3836e4f0dd3853f4066bfda66d430830258ed4d..0bc3862f85fe8227be459b453548a999de435580 100644 (file)
--- 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) {