diff options
| author | Taoguang Chen <chtg@users.noreply.github.com> | 2015-02-27 10:41:53 +0800 |
|---|---|---|
| committer | Taoguang Chen <chtg@users.noreply.github.com> | 2015-02-27 10:41:53 +0800 |
| commit | e441d71baae89bdc5dc6f75407b4a8f5e42b8fa9 (patch) | |
| tree | 042c269f526614a3d03c4195a7f5513ac4b35092 | |
| parent | f13a88ac1330f81b692a565156bf5d5a8fa78d15 (diff) | |
| download | php-git-e441d71baae89bdc5dc6f75407b4a8f5e42b8fa9.tar.gz | |
fix bug#68942's patch
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
| -rw-r--r-- | ext/date/php_date.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 720cdb61b7..81f6ae41a2 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3713,7 +3713,7 @@ static int php_date_timezone_initialize_from_hash(zval **return_value, php_timez zval **z_timezone_type = NULL; if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { - if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) { + if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_PP(z_timezone) TSRMLS_CC)) { return SUCCESS; } |