diff options
| author | Michael M Slusarz <slusarz@curecanti.org> | 2013-08-20 01:07:26 -0600 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-24 19:45:54 -0700 |
| commit | 3f9af558e78c9904f72933dfb3c735a9d2119b52 (patch) | |
| tree | a2ec82c81fbae004592948e66ee697309b387860 | |
| parent | 768c34e7cd4a7d9f7290825e887cb90fa0b137cc (diff) | |
| download | php-git-3f9af558e78c9904f72933dfb3c735a9d2119b52.tar.gz | |
Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/standard/filters.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug65483.phpt | 19 |
3 files changed, 24 insertions, 1 deletions
@@ -5,6 +5,8 @@ PHP NEWS - Core: . Fixed bug #65490 (Duplicate calls to get lineno & filename for DTRACE_FUNCTION_*). (Chris Jones) + . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding + spaces). (Michael M Slusarz) . Fixed bug #65481 (shutdown segfault due to serialize) (Mike) . Fixed bug #65470 (Segmentation fault in zend_error() with --enable-dtrace). (Chris Jones, Kris Van Hees) diff --git a/ext/standard/filters.c b/ext/standard/filters.c index 0a59039635..15dae1bee6 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -951,7 +951,9 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins *(pd++) = qp_digits[(c & 0x0f)]; ocnt -= 3; line_ccnt -= 3; - trail_ws--; + if (trail_ws > 0) { + trail_ws--; + } CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt); } } diff --git a/ext/standard/tests/streams/bug65483.phpt b/ext/standard/tests/streams/bug65483.phpt new file mode 100644 index 0000000000..d214bbbbcc --- /dev/null +++ b/ext/standard/tests/streams/bug65483.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #65483: quoted-printable encode stream filter incorrectly encoding spaces +--FILE-- +<?php + +$data = 'a b=c d'; + +$fd = fopen('php://temp', 'w+'); +fwrite($fd, $data); +rewind($fd); + +$res = stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ); +var_dump(stream_get_contents($fd, -1, 0)); + +fclose($fd); + +?> +--EXPECT-- +string(9) "a b=3Dc d" |