bug#72057 Fix RECV opcode to handle all kinds of exceptions#1872
bug#72057 Fix RECV opcode to handle all kinds of exceptions#1872php-pulls merged 1 commit intophp:masterfrom
Conversation
|
It might be that Edit: yeah it needed a change, I made it but I'm not sure about |
Zend/zend_vm_def.h
Outdated
| } | ||
|
|
||
| ZEND_VM_NEXT_OPCODE(); | ||
| ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); |
There was a problem hiding this comment.
This should be handled the same way as recv_init, i.e. by checking eg(exception) in the verify_arg_type branch.
There was a problem hiding this comment.
done, thanks for review
|
please also wrap EG(exception) checking into UNEXCEPT , and could you please squash these commits into one? I need cherry-pick them down to PHP-7.0, thanks |
fix RECV opcode to handle exceptions thrown from user-defined error handler as a result Notice error from failed type coercion
nikita2206
force-pushed
the
fix-recv-opcode-handle-exception
branch
from
bc22b23 to
ed9a1a9
Compare
|
@laruence squashed and rebased it on PHP-7.0 but github can't change PR target branch. The check was already in |
4 participants
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result of Notice error from failed type coercion