diff options
| author | Anatol Belski <ab@php.net> | 2016-11-08 11:15:06 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-08 11:15:06 +0100 |
| commit | 9b813423524c0507f78e90102f62fcdc1a83febb (patch) | |
| tree | 2370b9a49677d9f3d45a1ecc824593ef5f70c617 /ext/pdo | |
| parent | ed12167edf23e3bbd5eba8ef36bdcd8122e9ad0b (diff) | |
| parent | 2b30b542750a917932fed29cafac83d40a045ffe (diff) | |
| download | php-git-9b813423524c0507f78e90102f62fcdc1a83febb.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
remove unreferenced var came in with merge
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
fix version
set versions
Fix bug #73144 and bug #73341 - remove extra dtor
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 45024c11b7..7aaf76453b 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2293,6 +2293,7 @@ void pdo_stmt_init(void) pdo_row_ce->ce_flags |= ZEND_ACC_FINAL; /* when removing this a lot of handlers need to be redone */ pdo_row_ce->create_object = pdo_row_new; pdo_row_ce->serialize = pdo_row_serialize; + pdo_row_ce->unserialize = zend_class_unserialize_deny; } PDO_API void php_pdo_free_statement(pdo_stmt_t *stmt) |