From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 9 Apr 2013 08:09:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24f1045d55fa4d3df357b76cf6e35a1407267cf1;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix possible NULL deref
---

24f1045d55fa4d3df357b76cf6e35a1407267cf1