From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 20 Dec 2013 04:29:14 +0000 (-0800)
Subject: Refactor archive_version_details to eliminate size and printf concerns
X-Git-Tag: v3.1.900a~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f52ef84034ca318931cbc256d9dc2ab96f8a65;p=thirdparty%2Flibarchive.git

Refactor archive_version_details to eliminate size and printf concerns
---

diff --git a/libarchive/archive_util.c b/libarchive/archive_util.c
index 637022c8a..c1e171b68 100644
--- a/libarchive/archive_util.c
+++ b/libarchive/archive_util.c
@@ -88,28 +88,33 @@ archive_version_string(void)
 const char *
 archive_version_details(void)
 {
-	static char version[80];
-#ifdef HAVE_BZLIB_H
-	char *bzlib_version = strdup(BZ2_bzlibVersion());
-	char *ptr = strchr(bzlib_version, ',');
-	if (ptr)
-		*ptr = '\0';
-#endif
-	snprintf(version, sizeof(version), ARCHIVE_VERSION_STRING
+	static struct archive_string str;
+	static int init = 0;
+
+	if (!init) {
+		archive_string_init(&str);
+
+		archive_strcat(&str, ARCHIVE_VERSION_STRING);
 #ifdef HAVE_ZLIB_H
-		" zlib/" ZLIB_VERSION
+		archive_strcat(&str, " zlib/");
+		archive_strcat(&str, ZLIB_VERSION);
 #endif
 #ifdef HAVE_LZMA_H
-		" liblzma/" LZMA_VERSION_STRING
+		archive_strcat(&str, " liblzma/");
+		archive_strcat(&str, LZMA_VERSION_STRING);
 #endif
 #ifdef HAVE_BZLIB_H
-		" bz2lib/%s", bzlib_version
-#endif
-		);
-#ifdef HAVE_BZLIB_H
-	free(bzlib_version);
+		{
+			const char *p = BZ2_bzlibVersion();
+			char *sep = strchr(p, ',');
+			if (sep == NULL)
+				sep = p + strlen(p);
+			archive_strcat(&str, " bz2lib/");
+			archive_strncat(&str, p, sep - p);
+		}
 #endif
-	return (version);
+	    }
+	return str.s;
 }
 
 int