com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/php _date.c
| From: | Anatol Belski | Date: | Tue, 05 Apr 2016 09:24:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/php _date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91601@lists.php.net to get a copy of this message | ||
Commit: d10a8e48047dd57f4c454d62720dcd57191e424e
Author: Anatol Belski <ab@php.net> Tue, 5 Apr 2016 11:24:23 +0200
Parents: 4090e709aa3505e414243d4e19e18804ea8371e4 1aea777349f8b86495d23ed7c8c71632c7555e55
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d10a8e48047dd57f4c454d62720dcd57191e424e
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Use STR_EMPTY_ALLOC macro instead
Fix DateInterval::format segfault
Changed paths:
MM ext/date/php_date.c
Diff:
diff --cc ext/date/php_date.c
index c2ef177,750800d..e780b2e
--- 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;
}
/* }}} */