From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 16 May 2011 03:38:15 +0000 (-0400)
Subject: Use wmemcpy at archive_wstring_append().
X-Git-Tag: v3.0.0a~351
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c96952b2971c5aeef52f50d027e2d0de57ad7d35;p=thirdparty%2Flibarchive.git

Use wmemcpy at archive_wstring_append().

SVN-Revision: 3336
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 4a1da9209..abd1803ec 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -70,6 +70,9 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_string.c 201095 2009-12-28 02:33
 #include "archive_string.h"
 #include "archive_string_composition.h"
 
+#ifndef HAVE_WMEMCPY
+#define wmemcpy(a,b,i)  (wchar_t *)memcpy((a), (b), (i) * sizeof(wchar_t))
+#endif
 
 struct archive_string_conv {
 	struct archive_string_conv	*next;
@@ -168,7 +171,7 @@ archive_wstring_append(struct archive_wstring *as, const wchar_t *p, size_t s)
 {
 	if (archive_wstring_ensure(as, as->length + s + 1) == NULL)
 		__archive_errx(1, "Out of memory");
-	memcpy(as->s + as->length, p, s * sizeof(wchar_t));
+	wmemcpy(as->s + as->length, p, s);
 	as->length += s;
 	as->s[as->length] = 0;
 	return (as);