diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-26 15:51:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-26 15:51:53 +0800 |
| commit | 24540362b0da5d9bcc41fa043152e69b2e0ca986 (patch) | |
| tree | 2175c0160d9bb16424bf47bf37a8ed690e2f8854 /ext/standard/php_var.h | |
| parent | b7052ef16dccd5858626bb7899193cdc16853861 (diff) | |
| download | php-git-24540362b0da5d9bcc41fa043152e69b2e0ca986.tar.gz | |
Re-fixed unserialize
Diffstat (limited to 'ext/standard/php_var.h')
| -rw-r--r-- | ext/standard/php_var.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index f2c00611db..2472ebf57c 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -51,6 +51,7 @@ typedef struct php_unserialize_data* php_unserialize_data_t; PHPAPI void php_var_serialize(smart_str *buf, zval *struc, php_serialize_data_t *var_hash TSRMLS_DC); PHPAPI int php_var_unserialize(zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); +PHPAPI int php_var_unserialize_intern(zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); #define PHP_VAR_SERIALIZE_INIT(var_hash_ptr) \ do { \ @@ -113,13 +114,9 @@ do { \ } \ } while (0) -PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval *nzval); PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval *val); PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval); PHPAPI void var_destroy(php_unserialize_data_t *var_hash); - -#define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \ - var_replace((var_hash), (ozval), &(nzval)) PHPAPI zend_class_entry *php_create_empty_class(char *class_name, int len); |