archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
This commit is contained in:
Stanislav Malyshev 2014-09-02 12:33:02 -07:00
commit ce776aea57
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/main.c
View file

@ -1821,6 +1821,12 @@ void php_request_shutdown(void *dummy)
}
} zend_end_try();
/* Output buffer handlers may have created new objects. Mark these objects
as destructed to avoid calling their dtors too late on shutdown when
all dtors were supposed to be cleaned
*/
zend_objects_store_mark_destructed(&EG(objects_store) TSRMLS_CC);
/* 4. Reset max_execution_time (no longer executing php code after response sent) */
zend_try {
zend_unset_timeout(TSRMLS_C);