Skip to content

Fix OSS-Fuzz #427814452 #18965

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+42 −1
Open

Fix OSS-Fuzz #427814452 #18965

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ae4846
Fix OSS-Fuzz #427814452
nielsdos Jun 27, 2025
8276f9d
Switch approach to blocking the optimization
nielsdos Jul 2, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Switch approach to blocking the optimization 
Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>
  • Loading branch information
@nielsdos @iluuu1994
nielsdos and iluuu1994 committed Jul 2, 2025
commit 8276f9da202f2468ae878c3bd5013af9b507b49b
22 changes: 17 additions & 5 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4356,10 +4356,7 @@ static void zend_compile_assert(znode *result, zend_ast_list *args, zend_string
}
opline->result.num = zend_alloc_cache_slot();

/* Skip adding a message on piped assert(...) calls, hence the ZEND_AST_ZNODE check.
* We don't have access to the original AST anyway, so we would either need to duplicate
* this logic in pipe compilation or store the AST. Neither seems worth the complexity. */
if (args->children == 1 && args->child[0]->kind != ZEND_AST_ZNODE) {
if (args->children == 1) {
/* add "assert(condition) as assertion message */
zend_ast *arg = zend_ast_create_zval_from_str(
zend_ast_export("assert(", args->child[0], ")"));
Expand Down Expand Up @@ -6429,6 +6426,20 @@ static bool can_match_use_jumptable(zend_ast_list *arms) {
return 1;
}

static bool zend_is_deopt_pipe_name(zend_ast *ast)
{
if (ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(zend_ast_get_zval(ast)) != IS_STRING) {
return false;
}

/* Assert compilation adds a message operand, but this is incompatible with the
* pipe optimization that uses a temporary znode for the reference elimination.
* Therefore, disable the optimization for assert.
* Note that "assert" as a name is always treated as fully qualified. */
zend_string *str = zend_ast_get_str(ast);
return zend_string_equals_literal_ci(str, "assert");
}

static void zend_compile_pipe(znode *result, zend_ast *ast)
{
zend_ast *operand_ast = ast->child[0];
Expand Down Expand Up @@ -6456,7 +6467,8 @@ static void zend_compile_pipe(znode *result, zend_ast *ast)

/* Turn $foo |> bar(...) into bar($foo). */
if (callable_ast->kind == ZEND_AST_CALL
&& callable_ast->child[1]->kind == ZEND_AST_CALLABLE_CONVERT) {
&& callable_ast->child[1]->kind == ZEND_AST_CALLABLE_CONVERT
&& !zend_is_deopt_pipe_name(callable_ast->child[0])) {
fcall_ast = zend_ast_create(ZEND_AST_CALL,
callable_ast->child[0], arg_list_ast);
/* Turn $foo |> bar::baz(...) into bar::baz($foo). */
Expand Down