com php-src: It doesn't make sense to colect garbage after fatal errors: Zend/zend_gc.c
| From: | Dmitry Stogov | Date: | Fri, 23 Jan 2015 13:40:16 +0000 |
| Subject: | com php-src: It doesn't make sense to colect garbage after fatal errors: Zend/zend_gc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84347@lists.php.net to get a copy of this message | ||
Commit: 46e486ff3d15b5c4b10988fc8acf7884ea69279f
Author: Dmitry Stogov <dmitry@zend.com> Fri, 23 Jan 2015 16:40:16 +0300
Parents: f71e64e53a99cc15f46a51dfa13c2f7baf4b2afb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46e486ff3d15b5c4b10988fc8acf7884ea69279f
Log:
It doesn't make sense to colect garbage after fatal errors
Changed paths:
M Zend/zend_gc.c
Diff:
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index 966b615..986659d 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -137,7 +137,7 @@ ZEND_API void gc_init(void)
ZEND_API void gc_possible_root(zend_refcounted *ref)
{
- if (GC_TYPE(ref) == IS_NULL) {
+ if (UNEXPECTED(GC_TYPE(ref) == IS_NULL) || UNEXPECTED(CG(unclean_shutdown))) {
return;
}