]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Wed, 15 Jun 2016 06:56:07 +0000 (14:56 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 15 Jun 2016 06:56:07 +0000 (14:56 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Maybe fix bug #72011
  Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream
  Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL


Trivial merge