archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor newline handling in zend_scan_escape_string to use HANDLE_NEWLINE macro (#19112)

Browse source
This commit is contained in:
Yudai Takada 2025-07-13 17:40:31 +09:00 • committed by GitHub
parent a402edac1a
commit 6e22d4c096
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/zend_language_scanner.l
View file

@ -921,9 +921,7 @@ static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, c
ZVAL_EMPTY_STRING(zendlval); ZVAL_EMPTY_STRING(zendlval);
} else { } else {
zend_uchar c = (zend_uchar)*str; zend_uchar c = (zend_uchar)*str;
if (c == '\n' || c == '\r') { HANDLE_NEWLINE(c);
CG(zend_lineno)++;
}
ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR(c)); ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR(c));
} }
goto skip_escape_conversion; goto skip_escape_conversion;
@ -2512,9 +2510,7 @@ inline_char_handler:
ZVAL_EMPTY_STRING(zendlval); ZVAL_EMPTY_STRING(zendlval);
} else { } else {
zend_uchar c = (zend_uchar)*(yytext+bprefix+1); zend_uchar c = (zend_uchar)*(yytext+bprefix+1);
if (c == '\n' || c == '\r') { HANDLE_NEWLINE(c);
CG(zend_lineno)++;
}
ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR(c)); ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR(c));
} }
goto skip_escape_conversion; goto skip_escape_conversion;