From: Michael Tokarev Date: Fri, 2 May 2014 14:35:59 +0000 (+0400) Subject: libcacard: replace pstrcpy() with memcpy() X-Git-Tag: qemu-xen-4.6.0-rc1~469^2~5 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a22f8f38942623dc473bf5ced5b4117b8bdf4821;p=qemu-upstream-4.6-testing.git libcacard: replace pstrcpy() with memcpy() Commit 2e679780ae86c6ca8 replaced strncpy() with pstrcpy() in one place in libcacard. This is a qemu-specific function, while libcacard is a stand-alone library (or tries to be). But since we know the exact length of the string to copy, and know that it definitely will fit in the destination buffer, use memcpy() instead, and null-terminate the string after that. An alternative is to use g_strlcpy() or strncpy(), but memcpy() is more than adequate in this place. Signed-off-by: Michael Tokarev Cc: qemu-trivial@nongnu.org Cc: Alon Levy --- diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index ee2dfaee8..e2b196d8c 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -1162,7 +1162,8 @@ vcard_emul_options(const char *args) NEXT_TOKEN(vname) NEXT_TOKEN(type_params) type_params_length = MIN(type_params_length, sizeof(type_str)-1); - pstrcpy(type_str, type_params_length, type_params); + memcpy(type_str, type_params, type_params_length); + type_str[type_params_length] = '\0'; type = vcard_emul_type_from_string(type_str); NEXT_TOKEN(type_params)