From 761db77da53d3d5257a6e43a17411a63bce0e37c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 21 Aug 2016 16:30:06 +0000 Subject: [PATCH 1/1] =?utf8?q?[CDMAKE][CTR]=20Fix=20strtok=5Fs=20for=20emp?= =?utf8?q?ty=20strings.=20Part=20of=20Wine=20commit=204fa616c=20by=20Bernh?= =?utf8?q?ard=20=C3=9Cbelacker.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=72406 --- reactos/sdk/lib/crt/string/strtok_s.c | 3 +++ reactos/sdk/tools/cdmake/cdmake.c | 3 +++ 2 files changed, 6 insertions(+) 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)) -- 2.17.1