Skip to content

Commit

Permalink
Fix memory leak
Browse files Browse the repository at this point in the history
This fixes oss-fuzz #47648
  • Loading branch information
dstogov committed May 30, 2022
1 parent 591bd11 commit 3a8912f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ext/opcache/jit/zend_jit_x86.dasc
Original file line number Diff line number Diff line change
Expand Up @@ -6183,7 +6183,7 @@ static int zend_jit_assign_to_typed_ref(dasm_State **Dst,
| // if (UNEXPECTED(EG(exception) != NULL)) {
| MEM_OP2_1_ZTS cmp, aword, executor_globals, exception, 0, r0
| je >8 // END OF zend_jit_assign_to_variable()
| jmp ->exception_handler_undef
| jmp ->exception_handler
} else {
| jmp >8
}
Expand Down
26 changes: 26 additions & 0 deletions ext/opcache/tests/jit/assign_053.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
JIT ASSIGN: memory leak
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
opcache.protect_memory=1
--FILE--
<?php
class Test {
public string $x;
}
$test=new Test;
$test->x = " $y ";
$r = &$test->x + ($r = $y);
?>
--EXPECTF--
Warning: Undefined variable $y in %sassign_053.php on line 6

Warning: Undefined variable $y in %sassign_053.php on line 7

Fatal error: Uncaught TypeError: Cannot assign null to reference held by property Test::$x of type string in %sassign_053.php:7
Stack trace:
#0 {main}
thrown in %sassign_053.php on line 7

0 comments on commit 3a8912f

Please sign in to comment.