msvcrt: Use parameter checking macros for strtok_s.

14187ed2 · Eric Pouech · Alexandre Julliard · 8583bd31 · 14187ed2
Commit 14187ed2 authored Oct 29, 2010 by Eric Pouech Committed by Alexandre Julliard Nov 01, 2010
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

string.c dlls/msvcrt/string.c +2 -2

No files found.
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -152,8 +152,8 @@ char * CDECL MSVCRT_strtok( char *str, const char *delim )
 */
 char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx)
 {
-    if(!delim || !ctx || (!str && !*ctx)) {
+    if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(ctx != NULL) ||
-        MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
+        !MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) {
        *MSVCRT__errno() = MSVCRT_EINVAL;
        return NULL;
    }