com php-src: Fixed possible HashTable modification in its destructor: Zend/zend_hash.c
| From: | Dmitry Stogov | Date: | Thu, 06 Mar 2014 12:53:13 +0000 |
| Subject: | com php-src: Fixed possible HashTable modification in its destructor: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77702@lists.php.net to get a copy of this message | ||
Commit: 3e4c22b4998295b05eebb1ee080585b71b64be75
Author: Dmitry Stogov <dmitry@zend.com> Thu, 6 Mar 2014 16:53:13 +0400
Parents: dfe1fd73bf127de368a3098b3e5b251e7d7397b4
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e4c22b4998295b05eebb1ee080585b71b64be75
Log:
Fixed possible HashTable modification in its destructor
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 0f424cb..b189599 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -508,13 +508,17 @@ static zend_always_inline void _zend_hash_del_el_ex(HashTable *ht, uint idx,
Buc
}
}
}
- if (ht->pDestructor) {
- ht->pDestructor(&p->val);
- }
if (p->key) {
STR_RELEASE(p->key);
}
- Z_TYPE(p->val) = IS_UNDEF;
+ if (ht->pDestructor) {
+ zval tmp;
+ ZVAL_COPY_VALUE(&tmp, &p->val);
+ ZVAL_UNDEF(&p->val);
+ ht->pDestructor(&tmp);
+ } else {
+ ZVAL_UNDEF(&p->val);
+ }
}
static zend_always_inline void _zend_hash_del_el(HashTable *ht, uint idx, Bucket *p)