]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Sun, 27 Nov 2016 22:53:39 +0000 (14:53 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 27 Nov 2016 22:53:39 +0000 (14:53 -0800)
* PHP-7.0:
  Fix #73549: Use after free when stream is passed to imagepng


Trivial merge