com php-src: Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant) : ext/opcache/zend_file_cache.c
| From: | Xinchen Hui | Date: | Sun, 24 Jan 2016 11:56:47 +0000 |
| Subject: | com php-src: Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant) : ext/opcache/zend_file_cache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90737@lists.php.net to get a copy of this message | ||
Commit: d74cc3afcf4a3df3eb123546d471b2a58bbfc4d2
Author: Xinchen Hui <laruence@gmail.com> Sun, 24 Jan 2016 03:56:47 -0800
Parents: cc9445ce684b78646c7b6145897c2be1da46b724
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d74cc3afcf4a3df3eb123546d471b2a58bbfc4d2
Log:
Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant)
Bugs:
https://bugs.php.net/71435
Changed paths:
M ext/opcache/zend_file_cache.c
Diff:
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
index 6a9bb9c..40a19b9 100644
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -1087,7 +1087,7 @@ static void zend_file_cache_unserialize_class_constant(zval
*
UNSERIALIZE_PTR(Z_PTR_P(zv));
c = Z_PTR_P(zv);
- zend_file_cache_unserialize_class_constant(&c->value, script, buf);
+ zend_file_cache_unserialize_zval(&c->value, script, buf);
if (c->ce && !IS_UNSERIALIZED(c->ce)) {
UNSERIALIZE_PTR(c->ce);
}