diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-30 05:40:44 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-30 05:40:44 -0700 |
| commit | faddd409a44f1b0b991951361ccdc8487a003bd5 (patch) | |
| tree | f9f0f47c45e25076f0cd2f1385215c722c34dea0 /Zend/zend_objects_API.c | |
| parent | 598466e6d3b38151914569860e3db8d7b862a3fa (diff) | |
| parent | 9e17094cf4dde60432569246a9a59e48783530bb (diff) | |
| download | php-git-faddd409a44f1b0b991951361ccdc8487a003bd5.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Update NEWS
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
Remove ini dependency in test
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 1fe5d0c199..b5dd48f798 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -57,6 +57,11 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS obj->dtor(obj->object, i TSRMLS_CC); obj = &objects->object_buckets[i].bucket.obj; obj->refcount--; + + if (obj->refcount == 0) { + /* in case gc_collect_cycle is triggered before free_storage */ + GC_REMOVE_ZOBJ_FROM_BUFFER(obj); + } } } } |