Merge pull request #3064 from i1011/version-details-fix

Fix libattr version returned in archive_version_details, as well as a leak.

(cherry picked from commit b8a7b027f85e39092b4c5d759172a5691d995f4c)

diff --git a/libarchive/archive_version_details.c b/libarchive/archive_version_details.c
index 0fcb65d62a6edbc216dfe90dc81e8d3b11932409..be11aad67e2e1a6f944695d16d9bbbbf21dd4f80 100644 (file)
--- a/libarchive/archive_version_details.c
+++ b/libarchive/archive_version_details.c
@@ -176,7 +176,7 @@ archive_version_details(void)
        const char *libiconv = archive_libiconv_version();
        const char *libacl = archive_libacl_version();
        const char *librichacl = archive_librichacl_version();
-       const char *libattr = archive_libacl_version();
+       const char *libattr = archive_libattr_version();
 
        if (!init) {
                archive_string_init(&str);
@@ -230,6 +230,7 @@ archive_version_details(void)
                        archive_strcat(&str, " libiconv/");
                        archive_strcat(&str, libiconv);
                }
+               init = 1;
        }
        return str.s;
 }