From: Anatol Belski <ab@php.net>
Date: Mon, 29 Feb 2016 14:49:28 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~555^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f3417320eeeed1fa785813604d2a9a128b52427;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
---

0f3417320eeeed1fa785813604d2a9a128b52427