diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-14 18:39:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-14 18:39:48 +0200 |
| commit | 0bda0422af0a9a920135bf3d7b7b4784eb0df802 (patch) | |
| tree | 53c9577143b24f034fb560c97f904077c2f63ba1 /ext/date/php_date.c | |
| parent | 5aaffb79084ba929675a7e8543f91ff324439939 (diff) | |
| parent | 411eee7b5ae8b529b10184f98e3f9b02d93ba864 (diff) | |
| download | php-git-0bda0422af0a9a920135bf3d7b7b4784eb0df802.tar.gz | |
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_vm_execute.h
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 4114797702..e960161987 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3617,6 +3617,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size if (strlen(tz) != tz_len) { php_error_docref(NULL, E_WARNING, "Timezone must not contain null bytes"); + efree(dummy_t); return FAILURE; } |