Author: akhaldi
Date: Sun Aug 21 16:30:06 2016
New Revision: 72406
URL: http://svn.reactos.org/svn/reactos?rev=72406&view=rev
Log:
[CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by
Bernhard Übelacker.
Modified:
trunk/reactos/sdk/lib/crt/string/strtok_s.c
trunk/reactos/sdk/tools/cdmake/cdmake.c
Modified: trunk/reactos/sdk/lib/crt/string/strtok_s.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok_s.c?rev=72406&r1=72405&r2=72406&view=diff
==============================================================================
--- trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] Sun Aug 21
16:30:06 2016
@@ -18,7 +18,10 @@
while(*str && strchr(delim, *str))
str++;
if(!*str)
+ {
+ *ctx = str;
return NULL;
+ }
*ctx = str+1;
while(**ctx && !strchr(delim, **ctx))
Modified: trunk/reactos/sdk/tools/cdmake/cdmake.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/cdmake/cdmake.c?rev=72406&r1=72405&r2=72406&view=diff
==============================================================================
--- trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] Sun Aug 21
16:30:06 2016
@@ -1930,7 +1930,10 @@
while (*str && strchr(delim, *str))
str++;
if (!*str)
+ {
+ *ctx = str;
return NULL;
+ }
*ctx = str + 1;
while (**ctx && !strchr(delim, **ctx))
