Skip to content

Zend: Fix memory leak in ++/-- when overloading fetch access #11859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Zend: Fix memory leak in ++/-- when overloading fetch access #11859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8012a1d
Zend: Fix memory leak in ++/-- when overloading fetch access
Girgias Aug 2, 2023
3827a50
Drop now duplicate code
Girgias Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions Zend/tests/in-de-crement/overloaded_access.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
Overloaded array access with pre increment/decrement
--FILE--
<?php
set_error_handler(function($severity, $m) {
if (str_starts_with($m, 'Indirect modification of overloaded element')) { return; }
throw new Exception($m, $severity);
});
class Foo implements ArrayAccess {
function offsetGet($index): mixed {
return range(1, 5);
}
function offsetSet($index, $newval): void {
}
function offsetExists($index): bool {
return true;
}
function offsetUnset($index): void {
}
}
$foo = new Foo;
try {
$foo[0]++;
} catch (Throwable $ex) {
echo $ex->getMessage() . "\n";
}
$foo = new Foo;
try {
$foo[0]--;
} catch (Throwable $ex) {
echo $ex->getMessage() . "\n";
}
?>
--EXPECT--
Cannot increment array
Cannot decrement array
Comment on lines +35 to +36
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why the op type becomes an array, but that seems minor.

16 changes: 2 additions & 14 deletions Zend/zend_vm_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,15 +1500,9 @@ ZEND_VM_HELPER(zend_pre_inc_helper, VAR|CV, ANY)
}
}
increment_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
/* Smart branch expects result to be set with exceptions */
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_NULL(EX_VAR(opline->result.var));
}
HANDLE_EXCEPTION();
}
} while (0);

/* opcodes are expected to set the result value */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This comment seems rather useless. I'd prefer just removing it. result is primarily assigned for when the result of ++$foo is used. Nobody will understand the relation to the throw helper issue from this comment.

if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
}
Expand Down Expand Up @@ -1559,15 +1553,9 @@ ZEND_VM_HELPER(zend_pre_dec_helper, VAR|CV, ANY)
}
}
decrement_function(var_ptr);
if (UNEXPECTED(EG(exception))) {
/* Smart branch expects result to be set with exceptions */
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_NULL(EX_VAR(opline->result.var));
}
HANDLE_EXCEPTION();
}
} while (0);

/* opcodes are expected to set the result value */
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
}
Expand Down
32 changes: 4 additions & 28 deletions Zend/zend_vm_execute.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.