php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source 
* PHP-8.3:
  Fix OP1 leak in error path of post inc/dec
This commit is contained in:
Ilija Tovilo
2023-11-02 19:32:02 +01:00
parent 1226fe027a ddabe89add
commit 9ba9b8f874
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Zend/tests/oss_fuzz_63802.phpt Normal file
View File

@@ -0,0 +1,34 @@
--TEST--
oss-fuzz #63802: OP1 leak in error path of post inc/dec
--FILE--
<?php
class Foo {
public function preInc() {
++$this > 42;
}
public function preDec() {
--$this > 42;
}
public function postInc() {
$this++ > 42;
}
public function postDec() {
$this-- > 42;
}
}
$foo = new Foo();
foreach (['pre', 'post'] as $prePost) {
foreach (['inc', 'dec'] as $incDec) {
try {
$foo->{$prePost . ucfirst($incDec)}();
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
}
}
?>
--EXPECT--
Cannot increment Foo
Cannot decrement Foo
Cannot increment Foo
Cannot decrement Foo

6
Zend/zend_vm_def.h
View File

@@ -1606,9 +1606,6 @@ ZEND_VM_HELPER(zend_post_inc_helper, VAR|CV, ANY)
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
increment_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
HANDLE_EXCEPTION();
}
} while (0);
FREE_OP1();
@@ -1657,9 +1654,6 @@ ZEND_VM_HELPER(zend_post_dec_helper, VAR|CV, ANY)
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
decrement_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
HANDLE_EXCEPTION();
}
} while (0);
FREE_OP1();

12
Zend/zend_vm_execute.h generated
View File

@@ -21782,9 +21782,6 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_inc_hel
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
increment_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
HANDLE_EXCEPTION();
}
} while (0);
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@@ -21833,9 +21830,6 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_dec_hel
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
decrement_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
HANDLE_EXCEPTION();
}
} while (0);
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@@ -39149,9 +39143,6 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_inc_hel
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
increment_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
HANDLE_EXCEPTION();
}
} while (0);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -39199,9 +39190,6 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_dec_hel
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
decrement_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
HANDLE_EXCEPTION();
}
} while (0);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();