Skip to content

Commit 6124206

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Update NEWS zend: fix missing return in global register detection (GH-22206) (#22320)
2 parents 5b4b177 + 05e9a57 commit 6124206

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ PHP NEWS
55
- Core:
66
. Fixed bug GH-22290 (AST pretty printing does not correctly handle strings
77
containing NUL). (iliaal)
8+
. Fixed bug GH-22206 (missing return in global register detection).
9+
(P3p111n0)
810

911
- Reflection:
1012
. Fixed bug GH-22324 (Ignore leading namespace separator in

Zend/Zend.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ int emu(const opcode_handler_t *ip, void *fp) {
317317
while ((*ip)());
318318
FP = orig_fp;
319319
IP = orig_ip;
320+
return 0;
320321
}], [])],
321322
[php_cv_have_global_register_vars=yes],
322323
[php_cv_have_global_register_vars=no])

0 commit comments

Comments
 (0)