archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3'

Browse source
This commit is contained in:
Nikita Popov 2018-09-04 08:09:22 +02:00
commit ee33c943e7
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_opcode.c
View file

@ -563,6 +563,10 @@ ZEND_API int pass_two(zend_op_array *op_array)
CG(context).literals_size = op_array->last_literal; CG(context).literals_size = op_array->last_literal;
#endif #endif
/* Needs to be set directly after the opcode/literal reallocation, to ensure destruction
* happens correctly if any of the following fixups generate a fatal error. */
op_array->fn_flags |= ZEND_ACC_DONE_PASS_TWO;
opline = op_array->opcodes; opline = op_array->opcodes;
end = opline + op_array->last; end = opline + op_array->last;
while (opline < end) { while (opline < end) {
@ -691,7 +695,6 @@ ZEND_API int pass_two(zend_op_array *op_array)
} }
} }
op_array->fn_flags |= ZEND_ACC_DONE_PASS_TWO;
return 0; return 0;
} }