Rémi Bernon : msvcrt: Set next_token when str is empty in wcstok_s.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 9ef3ca8b2decc5467345465c1bc98a2ab2c65d66
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9ef3ca8b2decc5467345465c1bc98a2ab2c65d66

Author: Rémi Bernon <rbernon at codeweavers.com>
Date:   Tue May 25 15:59:46 2021 +0200

msvcrt: Set next_token when str is empty in wcstok_s.

Otherwise, when str is empty, an invalid parameter exception is raised.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 32bbef5d3e6a5b174bdc1343d2d43b161f45fa1b)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/msvcrt/wcs.c            | 11 +++++++----
 dlls/ucrtbase/tests/string.c | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 343dec70477..615b4f36a33 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1910,10 +1910,13 @@ wchar_t * CDECL wcstok_s( wchar_t *str, const wchar_t *delim,
     if (!str) str = *next_token;
 
     while (*str && wcschr( delim, *str )) str++;
-    if (!*str) return NULL;
-    ret = str++;
-    while (*str && !wcschr( delim, *str )) str++;
-    if (*str) *str++ = 0;
+    if (!*str) ret = NULL;
+    else
+    {
+        ret = str++;
+        while (*str && !wcschr( delim, *str )) str++;
+        if (*str) *str++ = 0;
+    }
     *next_token = str;
     return ret;
 }
diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c
index 1a4fbbd76f0..9b1d21b801c 100644
--- a/dlls/ucrtbase/tests/string.c
+++ b/dlls/ucrtbase/tests/string.c
@@ -418,6 +418,24 @@ static void test_wcstok(void)
     ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token);
     token = wcstok(NULL, L" ", NULL);
     ok(!token, "expected NULL, got %p\n", token);
+
+    next = NULL;
+    wcscpy(buffer, input);
+    token = wcstok(buffer, L"=", &next);
+    ok(!wcscmp(token, input), "expected \"%ls\", got \"%ls\"\n", input, token);
+    ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next);
+    token = wcstok(NULL, L"=", &next);
+    ok(!token, "expected NULL, got \"%ls\"\n", token);
+    ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next);
+
+    next = NULL;
+    wcscpy(buffer, L"");
+    token = wcstok(buffer, L"=", &next);
+    ok(token == NULL, "expected NULL, got \"%ls\"\n", token);
+    ok(next == buffer, "expected %p, got %p\n", buffer, next);
+    token = wcstok(NULL, L"=", &next);
+    ok(!token, "expected NULL, got \"%ls\"\n", token);
+    ok(next == buffer, "expected %p, got %p\n", buffer, next);
 }
 
 static void test__strnicmp(void)