com php-src: Temporary fix inifite loop in gc: Zend/zend_gc .c
| From: | Xinchen Hui | Date: | Sat, 11 Apr 2015 09:40:29 +0000 |
| Subject: | com php-src: Temporary fix inifite loop in gc: Zend/zend_gc .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86160@lists.php.net to get a copy of this message | ||
Commit: f08414ce1d475d7b3fdfc5e6ae82e8e3b8b10f0e
Author: Xinchen Hui <laruence@php.net> Sat, 11 Apr 2015 17:40:29 +0800
Parents: 45c3112726d96aa341f4fd4047add78d7d8e1a92
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f08414ce1d475d7b3fdfc5e6ae82e8e3b8b10f0e
Log:
Temporary fix inifite loop in gc
Changed paths:
M Zend/zend_gc.c
Diff:
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index a83c2e2..39695a0 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -254,7 +254,10 @@ tail_call:
if (EXPECTED(!ht)) {
ref = Z_COUNTED_P(zv);
GC_REFCOUNT(ref)++;
- goto tail_call;
+ if (GC_GET_COLOR(GC_INFO(ref)) != GC_BLACK) {
+ goto tail_call;
+ }
+ return;
}
} else {
return;