From: Stanislav Malyshev <stas@php.net>
Date: Tue, 20 Jan 2015 18:40:39 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e18ec956873d1cc1fcd4647f4a218c25d0f80209;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/standard/var_unserializer.c
---

e18ec956873d1cc1fcd4647f4a218c25d0f80209