[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 17/22] libcacard: replace pstrcpy() with memcpy()
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 17/22] libcacard: replace pstrcpy() with memcpy() |
Date: |
Mon, 5 May 2014 22:01:58 +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
Cc: Alon Levy <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-trivial] [PULL 07/22] hw/mips: Add missing 'static' and 'const' attributes, (continued)
- [Qemu-trivial] [PULL 07/22] hw/mips: Add missing 'static' and 'const' attributes, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 11/22] qemu-timer: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 06/22] hw/9pfs: Add missing 'static' attributes, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 18/22] qmp: report path ambiguity error, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 21/22] docs/memory.txt: Fix document on MMIO operations, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 14/22] hw/9pfs: Add include file for exported symbol, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 16/22] glib: move g_poll() replacement into glib-compat.h, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 10/22] ui: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 09/22] monitor: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 20/22] readline: Sort completions before printing them., Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 17/22] libcacard: replace pstrcpy() with memcpy(),
Michael Tokarev <=
- [Qemu-trivial] [PULL 13/22] xen: remove unused global, xen_xcg, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 19/22] readline: use g_strndup instead of open-coding it, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 08/22] hw/s390x: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 15/22] do not call g_thread_init() for glib >= 2.31, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 12/22] hw: Add missing 'static' attributes, Michael Tokarev, 2014/05/05
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2014-05-05, Peter Maydell, 2014/05/07