php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-17836: zend_vm_gen.php shouldn't break on Windows line endings
This commit is contained in:
Niels Dossche
2025-03-21 11:51:11 +01:00
parent 3dcf36c701 8d7cb8cc21
commit b233ed7e03
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_vm_gen.php
View File

@@ -2416,6 +2416,12 @@ function gen_vm($def, $skel) {
$max_opcode = 0;
$extra_num = 256;
foreach ($in as $line) {
// Handle Windows line endings, GH-17836; since a bunch of regular
// expressions below test for a newline at the end, just update the
// ending
if (substr($line, -2) === "\r\n") {
$line = substr_replace($line, "\n", -2);
}
++$lineno;
if (strpos($line,"ZEND_VM_HANDLER(") === 0 ||
strpos($line,"ZEND_VM_INLINE_HANDLER(") === 0 ||