diff options
| -rw-r--r-- | ext/mbstring/mbfilter.c | 3 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c index a98887130e..06200f968a 100644 --- a/ext/mbstring/mbfilter.c +++ b/ext/mbstring/mbfilter.c @@ -6974,6 +6974,9 @@ mbfl_strimwidth( } mbfl_convert_filter_flush(encoder); } + } else if (pc.status != 0) { + pc.device.pos = pc.endpos; + mbfl_convert_filter_copy(pc.decoder_backup, pc.decoder); } mbfl_convert_filter_flush(pc.decoder); } diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 2da30ca94c..d20d2bd7f6 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1164,7 +1164,7 @@ PHP_FUNCTION(mb_parse_str) len_list[n] = 0; } n++; - var = php_strtok_r(NULL, "&", &strtok_buf); + var = php_strtok_r(NULL, separator, &strtok_buf); } num = n; |