]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorStanislav Malyshev <stas@php.net>
Mon, 21 Mar 2016 05:51:12 +0000 (22:51 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 21 Mar 2016 05:51:12 +0000 (22:51 -0700)
* PHP-7.0:
  Fix bug #71750: use zend_string_safe_alloc for calculated allocations
  Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet

1  2 
ext/standard/url.c

Simple merge