]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2020 11:56:01 +0000 (14:56 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2020 11:56:01 +0000 (14:56 +0300)
* PHP-7.3:
  zend_timeout() may access EX(opline)

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
index 2fce1be298f07b20c30544097d9384289aa15c26,a84cfe3d4bb3f084b0a09deea1e07a87d9edaac9..559edd070c741e0e73e755411fd90eb2bf1e82db
@@@ -2874,9 -2051,10 +2874,10 @@@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_
        ZEND_VM_CONTINUE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
 +static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
  {
        EG(vm_interrupt) = 0;
+       SAVE_OPLINE();
        if (EG(timed_out)) {
                zend_timeout(0);
        } else if (zend_interrupt_function) {