- Make custom serializing work with zstr (as discussed with andrei)

diff --git a/Zend/zend.h b/Zend/zend.h
index faf5b3c3be570f13cc720db0f0421f3600cdd23a..5b1629b2bff6e4d4c05d9aaa212c91920b12672d 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -390,8 +390,8 @@ struct _zend_class_entry {
        int (*interface_gets_implemented)(zend_class_entry *iface, zend_class_entry *class_type TSRMLS_DC); /* a class implements this interface */
 
        /* serializer callbacks */
-       int (*serialize)(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC);
-       int (*unserialize)(zval **object, zend_class_entry *ce, const unsigned char *buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC);
+       int (*serialize)(zval *object, int *type, zstr *buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC);
+       int (*unserialize)(zval **object, zend_class_entry *ce, int type, const zstr buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC);
 
        zend_class_entry **interfaces;
        zend_uint num_interfaces;

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index d15ce3fdb4cf3f32abde13892c3d053c1e6a899a..891061249547ff2c365439b0e91441f41fa5fc27 100755 (executable)
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -411,7 +411,7 @@ static int zend_implement_arrayaccess(zend_class_entry *interface, zend_class_en
 /* }}}*/
 
 /* {{{ zend_user_serialize */
-int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC)
+int zend_user_serialize(zval *object, int *type, zstr *buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC)
 {
        zend_class_entry * ce = Z_OBJCE_P(object);
        zval *retval;
@@ -428,11 +428,10 @@ int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len
                        zval_ptr_dtor(&retval);
                        return FAILURE;
                case IS_UNICODE:
-                       convert_to_string(retval);
-                       /* no break */
                case IS_STRING:
-                       *buffer = (unsigned char*)estrndup(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
-                       *buf_len = Z_STRLEN_P(retval);
+                       *buffer = zend_zstrndup(Z_TYPE_P(retval), Z_UNIVAL_P(retval), Z_UNILEN_P(retval));
+                       *buf_len = Z_UNILEN_P(retval);
+                       *type = Z_TYPE_P(retval);
                        result = SUCCESS;
                        break;
                default: /* failure */
@@ -450,14 +449,14 @@ int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len
 /* }}} */
 
 /* {{{ zend_user_unserialize */
-int zend_user_unserialize(zval **object, zend_class_entry *ce, const unsigned char *buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC)
+int zend_user_unserialize(zval **object, zend_class_entry *ce, int type, const zstr buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC)
 {
        zval * zdata;
 
        object_init_ex(*object, ce);
 
        MAKE_STD_ZVAL(zdata);
-       ZVAL_STRINGL(zdata, (char*)buf, buf_len, 1);
+       ZVAL_ZSTRL(zdata, type, buf, buf_len, 1);
 
        zend_call_method_with_1_params(object, ce, &ce->unserialize_func, "unserialize", NULL, zdata);