Skip to content

Raise test stack for stream error depth limit under MSan - #23985

Merged
Girgias merged 1 commit into
php:masterfrom
realFlowControl:florian/stream-error-depth-stack-overflow
Sep 29, 2026
Merged

Girgias merged 1 commit into
php:masterfrom
realFlowControl:florian/stream-error-depth-stack-overflow

Conversation

@realFlowControl

Copy link
Copy Markdown
Contributor

In #23869 we saw that when running MSAN, ext/standard/tests/streams/stream_errors_operation_depth_limit.phpt fails with a C stack overflow.

I am not sure this will work in CI, but 🤞 it does. It basically just raises the stack limit to 32 MiB when an MSAN run is detected and skips the test if that is not possible.

@realFlowControl

Copy link
Copy Markdown
Contributor Author

@bukka could you add the CI: MSAN label please.

@realFlowControl
realFlowControl marked this pull request as ready for review September 29, 2026 10:54
@Girgias

Girgias commented Sep 29, 2026

Copy link
Copy Markdown
Member

@bukka could you add the CI: MSAN label please.

I've added the label, however Windows CI seems to be failing?

@realFlowControl

Copy link
Copy Markdown
Contributor Author

@bukka could you add the CI: MSAN label please.

I've added the label, however Windows CI seems to be failing?

Thanks @Girgias, the Windows CI is also failing on master 😞

@realFlowControl
realFlowControl force-pushed the florian/stream-error-depth-stack-overflow branch from 336ff4c to 5531f66 Compare September 29, 2026 11:52
@realFlowControl

Copy link
Copy Markdown
Contributor Author

Windows CI might be failing because of #23861 (comment), unrelated to this PR

@Girgias Girgias left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems reasonable, thanks!

@Girgias
Girgias merged commit d2208a2 into php:master Sep 29, 2026
17 of 18 checks passed
bukka added a commit to bukka/php-src that referenced this pull request Sep 29, 2026
* upstream/master: (99 commits)
  NEWS
  Fix property hook escape analysis causing misoptimization
  Fix __isset escape analysis causing misoptimization
  Fix memory leak when closing a statement on a killed connection
  Reset field_count for OK packet (php#23890)
  Fix phpGH-23986: Clear the realpath cache in the child after pcntl_fork() (php#23987)
  ext/standard: Remove redundant if-branch in rot13 (php#23795)
  ext/pdo: Throw a ValueError from bindColumn() for an unknown column (php#23835)
  Zend: rename zend_object* parameter to "this_ptr" for zend_call_* functions (php#23989)
  ext/pdo: Release driver options after bindParam and bindColumn
  tests: Raise test stack for stream error depth limit under MSan (php#23985)
  Zend: Remove zend_atomic.[ch] abstraction (php#23927)
  fibers: fix phpGH-23921 (Fibers start with error_reporting = 0 when the error_reporting INI directive is not set)
  ext/pdo: Keep statement class when ATTR_STATEMENT_CLASS is rejected
  Verify bundled sources using CI - Opcache JIT IR (php#20179)
  zend_portability: Simplify definition of `ZEND_NORETURN` (php#23908)
  Fix phpGH-23758: PDO_Firebird returns null for empty BLOBs (php#23763)
  Remove redundant parentheses in session tests (php#23609)
  Update IR (php#23861)
  Fix OSS-Fuzz #552682112: assertion failure wrt zp_arg_must_be_sent_by_ref() (php#23760)
  ...

# Conflicts:
#	ext/openssl/xp_ssl.c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants