From: Stanislav Malyshev <stas@php.net>
Date: Mon, 21 Mar 2016 05:51:12 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85ccebc1c21d57fb996b08d5a1ceda26ad86b010;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #71750: use zend_string_safe_alloc for calculated allocations
  Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet
---

85ccebc1c21d57fb996b08d5a1ceda26ad86b010