Skip to content

Commit 6e22d4c

Browse files
authored
Refactor newline handling in zend_scan_escape_string to use HANDLE_NEWLINE macro (#19112)
1 parent a402eda commit 6e22d4c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Zend/zend_language_scanner.l

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -921,9 +921,7 @@ static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, c
921921
ZVAL_EMPTY_STRING(zendlval);
922922
} else {
923923
zend_uchar c = (zend_uchar)*str;
924-
if (c == '\n' || c == '\r') {
925-
CG(zend_lineno)++;
926-
}
924+
HANDLE_NEWLINE(c);
927925
ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR(c));
928926
}
929927
goto skip_escape_conversion;
@@ -2512,9 +2510,7 @@ inline_char_handler:
25122510
ZVAL_EMPTY_STRING(zendlval);
25132511
} else {
25142512
zend_uchar c = (zend_uchar)*(yytext+bprefix+1);
2515-
if (c == '\n' || c == '\r') {
2516-
CG(zend_lineno)++;
2517-
}
2513+
HANDLE_NEWLINE(c);
25182514
ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR(c));
25192515
}
25202516
goto skip_escape_conversion;

0 commit comments

Comments
 (0)