diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-10-23 20:07:47 -0700 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-01 12:50:33 +0100 |
| commit | 8c67460a10865f53435c705d08bbc2d60a49f781 (patch) | |
| tree | 6740f6a5fe0a387ee99a226e97e6da1138dca18f /ext/pdo/pdo_stmt.c | |
| parent | 12bb3cd8d2791d34be855cfa1f48de35bb5faebb (diff) | |
| download | php-git-8c67460a10865f53435c705d08bbc2d60a49f781.tar.gz | |
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Proper soltion would be to call serialize/unserialize and deal with the result,
but this requires more work that should be done by wddx maintainer (not me).
(cherry picked from commit 6045de69c7dedcba3eadf7c4bba424b19c81d00d)
Conflicts:
ext/wddx/wddx.c
Diffstat (limited to 'ext/pdo/pdo_stmt.c')
| -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 d135467192..0ff8a04000 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2299,6 +2299,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) |