diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-03 10:19:57 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-03 10:19:57 -0800 |
| commit | d5dc3c69f91d953bb7fe096ed4da5d261b41429e (patch) | |
| tree | e7f309f13ab446ae0e1bfe907c810bfa48025817 | |
| parent | 8ab5d22332b4fbb9b683bac36ce0b5ebc5501794 (diff) | |
| parent | 036bc5c1fb38969f325f84b9474e5bc7309f54ba (diff) | |
| download | php-git-d5dc3c69f91d953bb7fe096ed4da5d261b41429e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix null pointer deref in qprint-encode filter (bug #77231)
| -rw-r--r-- | ext/standard/filters.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/filters/bug77231.phpt | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ext/standard/filters.c b/ext/standard/filters.c index 7115c534b0..cd92c6e2dc 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -922,7 +922,7 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins line_ccnt--; CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt); } else { - if (line_ccnt < 4) { + if (line_ccnt < 4 && inst->lbchars != NULL) { if (ocnt < inst->lbchars_len + 1) { err = PHP_CONV_ERR_TOO_BIG; break; diff --git a/ext/standard/tests/filters/bug77231.phpt b/ext/standard/tests/filters/bug77231.phpt new file mode 100644 index 0000000000..17967ee80f --- /dev/null +++ b/ext/standard/tests/filters/bug77231.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #77231 (Segfault when using convert.quoted-printable-encode filter) +--FILE-- +<?php +var_dump(file(urldecode('php://filter/convert.quoted-printable-encode/resource=data://,%bfAAAAAAAAFAAAAAAAAAAAAAA%ff%ff%ff%ff%ff%ff%ff%ffAAAAAAAAAAAAAAAAAAAAAAAA'))); +?> +--EXPECT-- +array(1) { + [0]=> + string(74) "=BFAAAAAAAAFAAAAAAAAAAAAAA=FF=FF=FF=FF=FF=FF=FF=FFAAAAAAAAAAAAAAAAAAAAAAAA" +}
\ No newline at end of file |