Commit a22f8f38 authored by Michael Tokarev's avatar Michael Tokarev
Browse files

libcacard: replace pstrcpy() with memcpy() 



Commit 2e679780 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: default avatarMichael Tokarev <mjt@tls.msk.ru>
Cc: qemu-trivial@nongnu.org
Cc: Alon Levy <alevy@redhat.com>
parent f95c967a

libcacard/vcard_emul_nss.c

+2 −1
Original line number Diff line number Diff line
@@ -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)