From: Paul Harris <paulharris@computer.org>
Date: Tue, 23 Jun 2015 14:21:39 +0000 (+0800)
Subject: Bugfix - should be copy+converting from mbs to utf. Not mbs to mbs.
X-Git-Tag: v3.1.900a~84^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4578e694e6e9b561653bc43f3c6a74366f42dfec;p=thirdparty%2Flibarchive.git

Bugfix - should be copy+converting from mbs to utf. Not mbs to mbs.
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index c8c87e0b3..f6d1b893b 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -3891,7 +3891,7 @@ archive_mstring_get_utf8(struct archive *a, struct archive_mstring *aes,
 		sc = archive_string_conversion_to_charset(a, "UTF-8", 1);
 		if (sc == NULL)
 			return (-1);/* Couldn't allocate memory for sc. */
-		r = archive_strncpy_l(&(aes->aes_mbs), aes->aes_mbs.s,
+		r = archive_strncpy_l(&(aes->aes_utf8), aes->aes_mbs.s,
 		    aes->aes_mbs.length, sc);
 		if (a == NULL)
 			free_sconv_object(sc);