diff options
| -rw-r--r-- | ext/standard/php_var.h | 4 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.c | 36 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 36 |
3 files changed, 75 insertions, 1 deletions
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index c17929afa6..b3c4dd5494 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -41,6 +41,7 @@ PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC); struct php_unserialize_data { void *first; + void *first_dtor; }; typedef struct php_unserialize_data php_unserialize_data_t; @@ -54,7 +55,8 @@ PHPAPI int php_var_unserialize(zval **rval, const unsigned char **p, const unsig zend_hash_destroy(&(var_hash)) #define PHP_VAR_UNSERIALIZE_INIT(var_hash) \ - (var_hash).first = 0 + (var_hash).first = 0; \ + (var_hash).first_dtor = 0 #define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \ var_destroy(&(var_hash)) diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 33cac154fb..354ab0fbdc 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -56,6 +56,30 @@ static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval) var_hash->data[var_hash->used_slots++] = *rval; } +static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +{ + var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; + + while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) { + prev = var_hash; + var_hash = var_hash->next; + } + + if (!var_hash) { + var_hash = emalloc(sizeof(var_entries)); + var_hash->used_slots = 0; + var_hash->next = 0; + + if (!var_hashx->first_dtor) + var_hashx->first_dtor = var_hash; + else + prev->next = var_hash; + } + + (*rval)->refcount++; + var_hash->data[var_hash->used_slots++] = *rval; +} + PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval) { int i; @@ -93,6 +117,7 @@ static int var_access(php_unserialize_data_t *var_hashx, int id, zval ***store) PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) { void *next; + int i; var_entries *var_hash = var_hashx->first; while (var_hash) { @@ -100,6 +125,17 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) efree(var_hash); var_hash = next; } + + var_hash = var_hashx->first_dtor; + + while (var_hash) { + for (i = 0; i < var_hash->used_slots; i++) { + zval_ptr_dtor(&var_hash->data[i]); + } + next = var_hash->next; + efree(var_hash); + var_hash = next; + } } /* }}} */ diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index fdff05fcd0..4d0ea6c3dc 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -54,6 +54,30 @@ static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval) var_hash->data[var_hash->used_slots++] = *rval; } +static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +{ + var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; + + while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) { + prev = var_hash; + var_hash = var_hash->next; + } + + if (!var_hash) { + var_hash = emalloc(sizeof(var_entries)); + var_hash->used_slots = 0; + var_hash->next = 0; + + if (!var_hashx->first_dtor) + var_hashx->first_dtor = var_hash; + else + prev->next = var_hash; + } + + (*rval)->refcount++; + var_hash->data[var_hash->used_slots++] = *rval; +} + PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval) { int i; @@ -91,6 +115,7 @@ static int var_access(php_unserialize_data_t *var_hashx, int id, zval ***store) PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) { void *next; + int i; var_entries *var_hash = var_hashx->first; while (var_hash) { @@ -98,6 +123,17 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) efree(var_hash); var_hash = next; } + + var_hash = var_hashx->first_dtor; + + while (var_hash) { + for (i = 0; i < var_hash->used_slots; i++) { + zval_ptr_dtor(&var_hash->data[i]); + } + next = var_hash->next; + efree(var_hash); + var_hash = next; + } } /* }}} */ |