]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Bugfix - should be copy+converting from mbs to utf. Not mbs to mbs. 564/head
authorPaul Harris <paulharris@computer.org>
Tue, 23 Jun 2015 14:21:39 +0000 (22:21 +0800)
committerPaul Harris <paulharris@computer.org>
Tue, 23 Jun 2015 14:21:39 +0000 (22:21 +0800)
libarchive/archive_string.c

index c8c87e0b39114b1a63fab87d31b0cdd932d11ff9..f6d1b893b8cd01e9a2604a20771869359ce961c0 100644 (file)
@@ -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);