Skip to content

Fix GH-12675: MEMORY_LEAK in phpdbg_prompt.c #12679

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

Fix GH-12675: MEMORY_LEAK in phpdbg_prompt.c #12679

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
465a5fe
Fix GH-12675: MEMORY_LEAK in phpdbg_prompt.c
nielsdos Nov 15, 2023
ac08d12
Disable opcache for test
nielsdos Nov 15, 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
2 changes: 2 additions & 0 deletions sapi/phpdbg/phpdbg_prompt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ PHPDBG_COMMAND(exec) /* {{{ */
if ((res_len != PHPDBG_G(exec_len)) || (memcmp(res, PHPDBG_G(exec), res_len) != SUCCESS)) {
if (PHPDBG_G(in_execution)) {
if (phpdbg_ask_user_permission("Do you really want to stop execution to set a new execution context?") == FAILURE) {
free(res);
return FAILURE;
}
}
Expand Down Expand Up @@ -441,6 +442,7 @@ PHPDBG_COMMAND(exec) /* {{{ */

phpdbg_compile();
} else {
free(res);
phpdbg_notice("Execution context not changed");
}
} else {
Expand Down
32 changes: 32 additions & 0 deletions sapi/phpdbg/tests/gh12675.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
GH-12675 (MEMORY_LEAK in phpdbg_prompt.c)
--INI--
opcache.enable=0
--PHPDBG--
ev file_put_contents("gh12675_1.tmp", "<?php echo 'hi';\necho 2;")
ev file_put_contents("gh12675_2.tmp", "<?php echo 'hi';")
exec nonexistent.php
exec gh12675_1.tmp
exec gh12675_1.tmp
b gh12675_1.tmp:2
r
exec gh12675_2.tmp
n
q
--EXPECTF--
prompt> 24
prompt> 16
prompt> [Cannot stat nonexistent.php, ensure the file exists]
prompt> [Set execution context: %sgh12675_1.tmp]
[Successful compilation of %sgh12675_1.tmp]
prompt> [Execution context not changed]
prompt> [Breakpoint #0 added at %sgh12675_1.tmp:2]
prompt> hi
[Breakpoint #0 at %sgh12675_1.tmp:2, hits: 1]
>00002: echo 2;
prompt> Do you really want to stop execution to set a new execution context? (type y or n): prompt>
--CLEAN--
<?php
@unlink("gh12675_1.tmp");
@unlink("gh12675_2.tmp");
?>