diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-04-22 21:26:06 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-04-22 21:26:39 -0700 |
| commit | 06d309fd7a917575d65c7a6f4f57b0e6bb0f9711 (patch) | |
| tree | 8225c8a19dc84a8529073935fe8485243b8d720f | |
| parent | cb981e39c29bda59897cfaf30cebbf534c27f47c (diff) | |
| download | php-git-06d309fd7a917575d65c7a6f4f57b0e6bb0f9711.tar.gz | |
Fix bug #76249 - fail on invalid sequences
| -rw-r--r-- | ext/iconv/iconv.c | 3 | ||||
| -rw-r--r-- | ext/iconv/tests/bug76249.phpt | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 69dd8c1cf7..fca5331541 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2672,6 +2672,9 @@ static int php_iconv_stream_filter_append_bucket( tcnt = 0; break; } + } else { + php_error_docref(NULL, E_WARNING, "iconv stream filter (\"%s\"=>\"%s\"): invalid multibyte sequence", self->from_charset, self->to_charset); + goto out_failure; } break; diff --git a/ext/iconv/tests/bug76249.phpt b/ext/iconv/tests/bug76249.phpt new file mode 100644 index 0000000000..5a9d8f171e --- /dev/null +++ b/ext/iconv/tests/bug76249.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #76249 (stream filter convert.iconv leads to infinite loop on invalid sequence) +--SKIPIF-- +<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> +--FILE-- +<?php +$fh = fopen('php://memory', 'rw'); +fwrite($fh, "abc"); +rewind($fh); +stream_filter_append($fh, 'convert.iconv.ucs-2/utf8//IGNORE', STREAM_FILTER_READ, []); +echo stream_get_contents($fh); +?> +DONE +--EXPECTF-- +Warning: stream_get_contents(): iconv stream filter ("ucs-2"=>"utf8//IGNORE"): invalid multibyte sequence in %sbug76249.php on line %d +ć…˘DONE |