From 38819040b63a71dcfe39bc8bbb2028717f05fddc Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Fri, 26 Nov 1999 13:34:31 +0000 Subject: [PATCH] Replace strtok with strtok_r --- ext/standard/post.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ext/standard/post.c b/ext/standard/post.c index 2185f59542..4f55b21276 100644 --- a/ext/standard/post.c +++ b/ext/standard/post.c @@ -305,6 +305,7 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) char *res = NULL, *var, *val; pval *array_ptr; int free_buffer=0; + char *strtok_buf = NULL; switch (arg) { case PARSE_POST: @@ -375,11 +376,11 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) } else { #endif if (arg == PARSE_COOKIE) { - var = strtok(res, ";"); + var = strtok_r(res, ";", &strtok_buf); } else if (arg == PARSE_POST) { - var = strtok(res, "&"); + var = strtok_r(res, "&", &strtok_buf); } else { - var = strtok(res, PG(arg_separator)); + var = strtok_r(res, PG(arg_separator), &strtok_buf); } while (var) { @@ -392,11 +393,11 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) php_parse_gpc_data2(val,var,array_ptr ELS_CC PLS_CC); } if (arg == PARSE_COOKIE) { - var = strtok(NULL, ";"); + var = strtok_r(NULL, ";", &strtok_buf); } else if (arg == PARSE_POST) { - var = strtok(NULL, "&"); + var = strtok_r(NULL, "&", &strtok_buf); } else { - var = strtok(NULL, PG(arg_separator)); + var = strtok_r(NULL, PG(arg_separator), &strtok_buf); } } #if HAVE_FDFLIB -- 2.40.0