diff options
| author | Marcus Boerger <helly@php.net> | 2005-03-07 22:27:29 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-03-07 22:27:29 +0000 |
| commit | 9c08e3ccae97d885eee75c36d4ab06793c06ac5c (patch) | |
| tree | af6b855de724e965e23891942bdaa9eb17069231 | |
| parent | 6200cdba7cc7a602a3c5b2ff3eee082c4288a839 (diff) | |
| download | php-git-9c08e3ccae97d885eee75c36d4ab06793c06ac5c.tar.gz | |
- Update signature
| -rwxr-xr-x | ext/pdo/pdo_stmt.c | 2 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 3d5ca21c33..e8bb2dd008 100755 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -870,7 +870,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, if (!ce->unserialize) { zend_throw_exception_ex(pdo_exception_ce, 0 TSRMLS_CC, "Class %s cannot be unserialized", ce->name); return 0; - } else if (ce->unserialize(&return_value, Z_TYPE_P(val) == IS_STRING ? Z_STRVAL_P(val) : "", Z_TYPE_P(val) == IS_STRING ? Z_STRLEN_P(val) : 0, NULL TSRMLS_CC) == FAILURE) { + } else if (ce->unserialize(&return_value, ce, Z_TYPE_P(val) == IS_STRING ? Z_STRVAL_P(val) : "", Z_TYPE_P(val) == IS_STRING ? Z_STRLEN_P(val) : 0, NULL TSRMLS_CC) == FAILURE) { zend_throw_exception_ex(pdo_exception_ce, 0 TSRMLS_CC, "Class %s cannot be unserialized", ce->name); zval_dtor(return_value); ZVAL_NULL(return_value); diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 5900773d15..8b2c79cdcd 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -298,8 +298,8 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce) zend_error(E_WARNING, "Insufficient data for unserializing - %d required, %d present", datalen, max - (*p)); return 0; } - - if(ce->unserialize(rval, *p, datalen, (zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) { + + if(ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) { return 0; } |