diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:26:17 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:26:17 -0800 |
| commit | 17094017f75cd4cde935c5d6569eee20540ffe36 (patch) | |
| tree | fea78c915d6483e34ff60cdb0e54e7137c0b29eb | |
| parent | ffb62112f86b047c7e2881dbadd2647c4729c54e (diff) | |
| parent | 489bfb0af9a03ea1d2134e0bf84670e40e5f05ca (diff) | |
| download | php-git-17094017f75cd4cde935c5d6569eee20540ffe36.tar.gz | |
Merge branch 'pull-request/914' into PHP-5.5
* pull-request/914:
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 5b62b540b7..fe1430f028 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3665,6 +3665,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; } |