Skip to content

Commit 036bc5c

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix null pointer deref in qprint-encode filter (bug #77231)
2 parents 5718d73 + 78bffa7 commit 036bc5c

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

ext/standard/filters.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
919919
line_ccnt--;
920920
CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
921921
} else {
922-
if (line_ccnt < 4) {
922+
if (line_ccnt < 4 && inst->lbchars != NULL) {
923923
if (ocnt < inst->lbchars_len + 1) {
924924
err = PHP_CONV_ERR_TOO_BIG;
925925
break;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--TEST--
2+
Bug #77231 (Segfault when using convert.quoted-printable-encode filter)
3+
--FILE--
4+
<?php
5+
var_dump(file(urldecode('php://filter/convert.quoted-printable-encode/resource=data://,%bfAAAAAAAAFAAAAAAAAAAAAAA%ff%ff%ff%ff%ff%ff%ff%ffAAAAAAAAAAAAAAAAAAAAAAAA')));
6+
?>
7+
--EXPECT--
8+
array(1) {
9+
[0]=>
10+
string(74) "=BFAAAAAAAAFAAAAAAAAAAAAAA=FF=FF=FF=FF=FF=FF=FF=FFAAAAAAAAAAAAAAAAAAAAAAAA"
11+
}

0 commit comments

Comments
 (0)