diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /Zend/zend_list.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'Zend/zend_list.c')
| -rw-r--r-- | Zend/zend_list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index bb340ae490..d8141f8664 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -169,7 +169,7 @@ void list_entry_destructor(zval *zv) zend_resource_dtor(res TSRMLS_CC); } - efree(res); + efree_size(res, sizeof(zend_resource)); } void plist_entry_destructor(zval *zv) |