From 77fed724617def3c6ed350bd449432e2b67bccb1 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Mon, 24 Nov 2008 19:21:20 +0000 Subject: [PATCH] Fixed bug #44075 (strtok misbehaving on unicode string) --- ext/standard/string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index 693cff0cc6..dc96e99313 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1569,8 +1569,11 @@ PHP_FUNCTION(strtok) end = i; if (end - start) { + RETVAL_UNICODEL(u_p + start, end - start, 1); + /* skip matched token */ + U16_FWD_1(u_p, end, rem_len); BG(strtok_last) = u_p + end; - RETURN_UNICODEL(u_p + start, end - start, 1); + return; } else { BG(strtok_last) = NULL; RETURN_FALSE; -- 2.50.1