diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-07-30 03:21:44 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-07-30 03:21:44 +0100 |
| commit | 85bf8b4ff19b9ab4f30be0265db9a18805b0ebc0 (patch) | |
| tree | 08f6fbd6e4046a8e1b2c05ff9b886160d4cec38c /Zend/zend_vm_execute.h | |
| parent | f65bdda469dfc30bd28652a6aa94d369eac1b6b2 (diff) | |
| download | php-git-85bf8b4ff19b9ab4f30be0265db9a18805b0ebc0.tar.gz | |
Fixed unbound scoped closure edge cases and added tests for them
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 81aeb43295..27fa59737f 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -509,7 +509,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR if (UNEXPECTED(EG(exception) != NULL)) { HANDLE_EXCEPTION(); } - } else { + } else if (!(fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC_EXPLICIT)){ /* FIXME: output identifiers properly */ /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically", fbc->common.scope->name, fbc->common.function_name); |