Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Fix bug #67644 - Memory corruption & crash during ob_start function callback
nikic · Sep 2, 2014 · af85eff · af85eff
2 parents 4b9fcc0 + 53fa6c5
commit af85eff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
   . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
   . Fixed bug #65463 (SIGSEGV during zend_shutdown()). (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)
 
 - COM:

diff --git a/main/main.c b/main/main.c
@@ -1767,6 +1767,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);