]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 3 Dec 2018 18:19:49 +0000 (10:19 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 3 Dec 2018 18:19:49 +0000 (10:19 -0800)
commit036bc5c1fb38969f325f84b9474e5bc7309f54ba
tree46e40ffd143550ee551002cd9871ce83fed6e992
parent5718d73dbbca4a1940fef48749ae8c43cc4157a0
parent78bffa72c1ad8936eae51270f93be17a9c58cfc1
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix null pointer deref in qprint-encode filter (bug #77231)
ext/standard/filters.c