[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/7] libcacard: replace pstrcpy() with memcpy()
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PATCH v2 5/7] libcacard: replace pstrcpy() with memcpy() |
Date: |
Fri, 2 May 2014 18:35:59 +0400 |
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 <address@hidden>
Cc: address@hidden
---
libcacard/vcard_emul_nss.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
index ee2dfae..e2b196d 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)
--
1.7.10.4
- [Qemu-devel] [PATCH v2 0/7] glib thread interface and libcacard cleanups, Michael Tokarev, 2014/05/02
- [Qemu-devel] [PATCH v2 2/7] glib: move g_poll() replacement into glib-compat.h, Michael Tokarev, 2014/05/02
- [Qemu-devel] [PATCH v2 1/7] do not call g_thread_init() for glib >= 2.31, Michael Tokarev, 2014/05/02
- [Qemu-devel] [PATCH v2 4/7] vscclient: use glib thread primitives not qemu, Michael Tokarev, 2014/05/02
- [Qemu-devel] [PATCH v2 3/7] glib-compat.h: add new thread API emulation on top of pre-2.31 API, Michael Tokarev, 2014/05/02
- [Qemu-devel] [PATCH v2 6/7] libcacard: replace qemu thread primitives with glib ones, Michael Tokarev, 2014/05/02
- [Qemu-devel] [PATCH v2 5/7] libcacard: replace pstrcpy() with memcpy(),
Michael Tokarev <=
- [Qemu-devel] [PATCH v2 7/7] libcacard: actually use symbols file, Michael Tokarev, 2014/05/02