From: Anatol Belski <ab@php.net>
Date: Tue, 5 Apr 2016 09:24:23 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.6RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d10a8e48047dd57f4c454d62720dcd57191e424e;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
---

d10a8e48047dd57f4c454d62720dcd57191e424e
diff --cc ext/date/php_date.c
index c2ef177894,750800da4c..e780b2ee6b
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -4270,7 -4359,11 +4270,11 @@@ static zend_string *date_interval_forma
  
  	smart_str_0(&string);
  
 -	if (string.c == NULL) {
 -		return STR_EMPTY_ALLOC();
++	if (string.s == NULL) {
++		return ZSTR_EMPTY_ALLOC();
+ 	}
+ 
 -	return string.c;
 +	return string.s;
  }
  /* }}} */