From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 21 Aug 2016 16:30:06 +0000 (+0000)
Subject: [CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by Bernhard... 
X-Git-Tag: backups/sndblst@72664~245
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=761db77da53d3d5257a6e43a17411a63bce0e37c;ds=sidebyside

[CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by Bernhard Übelacker.

svn path=/trunk/; revision=72406
---

diff --git a/reactos/sdk/lib/crt/string/strtok_s.c b/reactos/sdk/lib/crt/string/strtok_s.c
index 46a06cd8e38..6e8b5609e22 100644
--- a/reactos/sdk/lib/crt/string/strtok_s.c
+++ b/reactos/sdk/lib/crt/string/strtok_s.c
@@ -18,7 +18,10 @@ char * CDECL strtok_s(char *str, const char *delim, char **ctx)
     while(*str && strchr(delim, *str))
         str++;
     if(!*str)
+    {
+        *ctx = str;
         return NULL;
+    }
 
     *ctx = str+1;
     while(**ctx && !strchr(delim, **ctx))
diff --git a/reactos/sdk/tools/cdmake/cdmake.c b/reactos/sdk/tools/cdmake/cdmake.c
index 5f1db6ed1de..d02ccc6ef55 100644
--- a/reactos/sdk/tools/cdmake/cdmake.c
+++ b/reactos/sdk/tools/cdmake/cdmake.c
@@ -1930,7 +1930,10 @@ char* strtok_s(char *str, const char *delim, char **ctx)
     while (*str && strchr(delim, *str))
         str++;
     if (!*str)
+    {
+        *ctx = str;
         return NULL;
+    }
 
     *ctx = str + 1;
     while (**ctx && !strchr(delim, **ctx))