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

JIT: Fix register clobbering

Browse source 
Fixes oss-fuzz #45590
This commit is contained in:
Dmitry Stogov 2022-03-21 16:08:52 +03:00
parent e9fc81a2f8
commit cf83bdd925
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/opcache/jit/zend_jit_x86.dasc
View file

@ -15877,6 +15877,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
if (op1_info & MAY_BE_DOUBLE) { if (op1_info & MAY_BE_DOUBLE) {
regset = ZEND_REGSET(ZREG_XMM0); regset = ZEND_REGSET(ZREG_XMM0);
} }
if (opline->result_type != IS_UNUSED && (op1_info & MAY_BE_LONG)) {
ZEND_REGSET_INCL(regset, ZREG_R1);
}
} }
break; break;
case ZEND_ADD: case ZEND_ADD:

21
ext/opcache/tests/jit/reg_alloc_014.phpt Normal file
View file

@ -0,0 +1,21 @@
--TEST--
Register Alloction 014: Register clobbering
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
function foo() {
for($cnt = 0; $cnt < 6; $cnt++) {
$e = $a-- + $a-- + $a *= $a;
for ($i = 0; $i <= .1; $i++);
}
}
foo();
?>
DONE
--EXPECTF--
Warning: Undefined variable $a in %sreg_alloc_014.php on line 4
DONE