Browse Source

- Fix bug #45239 (encoding detector hangs with mbstring.strict_detection

enabled).
experimental/first_unicode_implementation
Moriyoshi Koizumi 17 years ago
parent
commit
30c9faaf86
  1. 5
      ext/mbstring/libmbfl/mbfl/mbfilter.c
  2. 18
      ext/mbstring/tests/bug45239.phpt

5
ext/mbstring/libmbfl/mbfl/mbfilter.c

@ -462,10 +462,9 @@ enum mbfl_no_encoding mbfl_encoding_detector_judge(mbfl_encoding_detector *ident
while (n >= 0) {
filter = identd->filter_list[n];
if (!filter->flag) {
if (identd->strict && filter->status) {
continue;
if (!identd->strict || !filter->status) {
encoding = filter->encoding->no_encoding;
}
encoding = filter->encoding->no_encoding;
}
n--;
}

18
ext/mbstring/tests/bug45239.phpt

@ -0,0 +1,18 @@
--TEST--
Bug #45239 (encoding detector hangs with mbstring.strict_detection enabled)
--INI--
mbstring.strict_detection=1
mbstring.http_input=UTF-8
mbstring.internal_encoding=UTF-8
--SKIPIF--
<?php
extension_loaded('mbstring') or die('skip');
?>
--FILE--
<?php
mb_internal_encoding("utf-8");
mb_parse_str("a=%fc", $dummy);
var_dump(mb_http_input());
?>
--EXPECT--
string(5) "UTF-8"
Loading…
Cancel
Save