two bug fixed: return value of mb_strimwidth() was invalid and separator parameter...

diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c
index a98887130e142f879af02c7954eadcd064f687a1..06200f968af774d595f241566dec65ef2f0ed3d0 100644 (file)
--- 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 2da30ca94cc6315e33405f9b20624080c1f29196..d20d2bd7f61238f5525188c0e2ea723fe4aecc0f 100644 (file)
--- 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;