Skip to content

[pull] master from php:master #1125

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

Merged
pull merged 2 commits into from
Jul 26, 2026
+15 −3
Merged

[pull] master from php:master #1125

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
8334703
CI: Fix writing-tests.rst format to pass doc rstfmt CI
LamentXU123 Jul 26, 2026
7ad79be
Fix use-of-uninitialized-value ast->lineno
iluuu1994 Jul 26, 2026
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
12 changes: 12 additions & 0 deletions Zend/tests/oss-fuzz-539121135.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--TEST--
OSS-Fuzz-539121135: Use-of-uninitialized-value ast->lineno
--FILE--
<?php

namespace {}

''

?>
--EXPECTF--
Fatal error: No code may exist outside of namespace {} in %s on line %d
2 changes: 1 addition & 1 deletion Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12215,7 +12215,7 @@ static void zend_compile_stmt(zend_ast *ast) /* {{{ */
return;
}

CG(zend_lineno) = ast->lineno;
CG(zend_lineno) = zend_ast_get_lineno(ast);

if ((CG(compiler_options) & ZEND_COMPILE_EXTENDED_STMT) && !zend_is_unticked_stmt(ast)) {
zend_do_extended_stmt(NULL);
Expand Down
4 changes: 2 additions & 2 deletions docs/source/miscellaneous/writing-tests.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ and not in the INI section. This is because of the order in which settings are c

If a TZ environmental variable is found the INI setting will be ignored.

Tests that run, or only have matching EXPECT output, on 32bit platforms can use a SKIPIF
section like:
Tests that run, or only have matching EXPECT output, on 32bit platforms can use a SKIPIF section
like:

.. code:: php

Expand Down