]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Sat, 16 Apr 2016 18:38:10 +0000 (20:38 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 16 Apr 2016 18:38:10 +0000 (20:38 +0200)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index e8a9ab2890e3acb706282bd62d4b2be588bebbef,00a9effcfadfca611601195891df294f12a52746..49941f9f142d739983b1debe256b6ef1e1e0efcc
@@@ -4292,10 -4316,10 +4289,10 @@@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_R
        arg = ZEND_CALL_VAR(EX(call), opline->result.var);
        ZVAL_COPY_VALUE(arg, varptr);
  
-       ZEND_VM_NEXT_OPCODE();
+       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
 -ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, ANY)
 +ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM)
  {
        USE_OPLINE
        zend_free_op free_op1;
Simple merge