diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:32:56 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:32:56 -0800 |
| commit | c64949626dd21ec571f48a54d187da4c9ad312b7 (patch) | |
| tree | ec3fef90ff28ffc233af65bd2e8aff92d7aa1232 /ext/date/php_date.c | |
| parent | 25e3e78016572cf86e4dff7bb0179f639abd5603 (diff) | |
| parent | de65eaa8c8faf6ae256aef3a2a074255b249a6f0 (diff) | |
| download | php-git-c64949626dd21ec571f48a54d187da4c9ad312b7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Fixes memory leak introduced in 2b9af967
Conflicts:
ext/openssl/openssl.c
Diffstat (limited to 'ext/date/php_date.c')
| -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 6146dec927..28a43e6678 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3641,6 +3641,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; } |