]> granicus.if.org Git - php/commitdiff
- Update signature
authorMarcus Boerger <helly@php.net>
Mon, 7 Mar 2005 22:27:29 +0000 (22:27 +0000)
committerMarcus Boerger <helly@php.net>
Mon, 7 Mar 2005 22:27:29 +0000 (22:27 +0000)
ext/pdo/pdo_stmt.c
ext/standard/var_unserializer.re

index 3d5ca21c334672eec0d6db0a26affa8100125eab..e8bb2dd0088b748a1a86b93f1cc34ca3fae27662 100755 (executable)
@@ -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);
index 5900773d1549f93eff9e1b41c2688fb12c790acf..8b2c79cdcd4153d8c3d11c763e74a8e85f2706a3 100644 (file)
@@ -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;
        }