ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Use memmove to copy memory in memcpy_s. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-10-05 16:38:54 +02:00 committed by Alexandre Julliard
parent be56a83fd0
commit 055ca5e4d9
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/heap.c
View File

@ -799,7 +799,7 @@ int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void
return MSVCRT_ERANGE; return MSVCRT_ERANGE;
} }
memcpy(dest, src, count); memmove(dest, src, count);
return 0; return 0;
} }

14
dlls/msvcrt/tests/string.c
View File

@ -615,7 +615,7 @@ static void test_strcpy_s(void)
static void test_memcpy_s(void) static void test_memcpy_s(void)
{ {
static char dest[8]; static char dest[8], buf[32];
static const char tiny[] = {'T',0,'I','N','Y',0}; static const char tiny[] = {'T',0,'I','N','Y',0};
static const char big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; static const char big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0};
int ret; int ret;
@ -667,6 +667,18 @@ static void test_memcpy_s(void)
ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret);
ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno);
okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X');
ret = p_memcpy_s(buf, ARRAY_SIZE(buf), big, ARRAY_SIZE(big));
ok(!ret, "memcpy_s returned %d\n", ret);
ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n");
ret = p_memcpy_s(buf + 1, ARRAY_SIZE(buf) - 1, buf, ARRAY_SIZE(big));
ok(!ret, "memcpy_s returned %d\n", ret);
ok(!memcmp(buf + 1, big, sizeof(big)), "unexpected buf\n");
ret = p_memcpy_s(buf, ARRAY_SIZE(buf), buf + 1, ARRAY_SIZE(big));
ok(!ret, "memcpy_s returned %d\n", ret);
ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n");
} }
static void test_memmove_s(void) static void test_memmove_s(void)