mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
This commit is contained in:
Stanislav Malyshev 2014-09-02 12:32:18 -07:00
commit 63f42adbb2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -7,11 +7,12 @@ PHP NEWS
. Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk) . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
. Fixed bug #65463 (SIGSEGV during zend_shutdown()). (Keyur Govande) . Fixed bug #65463 (SIGSEGV during zend_shutdown()). (Keyur Govande)
. Fixed bug #66036 (Crash on SIGTERM in apache process). (Keyur Govande) . Fixed bug #66036 (Crash on SIGTERM in apache process). (Keyur Govande)
. Fixed bug #67644 (Memory corruption & crash during ob_start function
callback). (Stas)
. Fixed bug #67878 (program_prefix not honoured in man pages). (Remi) . Fixed bug #67878 (program_prefix not honoured in man pages). (Remi)
. Fixed bug #67938 (Segfault when extending interface method with variadic). . Fixed bug #67938 (Segfault when extending interface method with variadic).
(Nikita) (Nikita)
- Fileinfo: - Fileinfo:
. Fixed bug #67731 (finfo::file() returns invalid mime type . Fixed bug #67731 (finfo::file() returns invalid mime type
for binary files). (Anatol) for binary files). (Anatol)

6
main/main.c
View File

@ -1843,6 +1843,12 @@ void php_request_shutdown(void *dummy)
} }
} zend_end_try(); } 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) */ /* 4. Reset max_execution_time (no longer executing php code after response sent) */
zend_try { zend_try {
zend_unset_timeout(TSRMLS_C); zend_unset_timeout(TSRMLS_C);