diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-05-03 11:13:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-05-03 11:13:41 +0800 |
| commit | d08df4442509d67400ac4edfa997f92712614f2c (patch) | |
| tree | fbf07fb20a88670660b08705556ec4e058134351 /Zend/zend_API.c | |
| parent | 824641e8c295df48cd0eab4df5dd9946dfa2413b (diff) | |
| parent | b4c500922024a647a694441f970e432d4f27be39 (diff) | |
| download | php-git-d08df4442509d67400ac4edfa997f92712614f2c.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Mark fcc as initialized for object calls
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 9963ef322a..f646883435 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3353,6 +3353,7 @@ again: memcpy(ZSTR_VAL(*callable_name), ZSTR_VAL(ce->name), ZSTR_LEN(ce->name)); memcpy(ZSTR_VAL(*callable_name) + ZSTR_LEN(ce->name), "::__invoke", sizeof("::__invoke")); } + fcc->initialized = 1; return 1; } if (callable_name) { |