]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Tue, 14 Jun 2016 10:20:23 +0000 (18:20 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 14 Jun 2016 10:20:23 +0000 (18:20 +0800)
* 'master' of git.php.net:/php-src:
  Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL


Trivial merge