diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:26:39 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:26:39 -0800 |
| commit | de65eaa8c8faf6ae256aef3a2a074255b249a6f0 (patch) | |
| tree | 1b9e63c8db5ab75956c7c3d7a3ab93a0e7b3424b | |
| parent | 8c08124c0ea18bc45c1b64a33953029c2c91d658 (diff) | |
| parent | 17094017f75cd4cde935c5d6569eee20540ffe36 (diff) | |
| download | php-git-de65eaa8c8faf6ae256aef3a2a074255b249a6f0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes memory leak introduced in 2b9af967
| -rw-r--r-- | ext/date/php_date.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index bf29a56068..804b50d8ce 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3690,6 +3690,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML return FAILURE; } else { set_timezone_from_timelib_time(tzobj, dummy_t); + free(dummy_t->tz_abbr); efree(dummy_t); return SUCCESS; } |