Dmitry Timoshkov : msvcrt: Fix handling of dst == src in wcscpy_s.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: aa2bc9536219a34b09768aaac1959bd5f46056fe
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=aa2bc9536219a34b09768aaac...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Mon Jun 24 11:49:34 2019 +0800

msvcrt: Fix handling of dst == src in wcscpy_s.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 9ade30d0ce7f107e775c72e628ff6e4444b9bdf4)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/msvcrt/tests/string.c |  5 +++++
 dlls/msvcrt/wcs.c          | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 9a1149dcb6..79a502bca9 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -1020,6 +1020,11 @@ static void test_wcscpy_s(void)
     ok(ret == 0, "expected 0 got %d\n", ret);
     ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n");
 
+    /* dest == source */
+    ret = p_wcscpy_s(szDest, 18, szDest);
+    ok(ret == 0, "expected 0 got %d\n", ret);
+    ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n");
+
     /* Copy smaller buffer size */
     errno = EBADF;
     szDest[0] = 'A';
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index dc5419cb72..b352bf7a88 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -2041,16 +2041,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con
     if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL;
     if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL;
 
-    wcDest[0] = 0;
-
-    if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL;
+    if(!MSVCRT_CHECK_PMT(wcSrc))
+    {
+        wcDest[0] = 0;
+        return MSVCRT_EINVAL;
+    }
 
     size = strlenW(wcSrc) + 1;
 
     if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE))
+    {
+        wcDest[0] = 0;
         return MSVCRT_ERANGE;
+    }
 
-    memcpy( wcDest, wcSrc, size*sizeof(WCHAR) );
+    memmove( wcDest, wcSrc, size*sizeof(WCHAR) );
 
     return 0;
 }