diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-06 12:04:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-06 12:04:23 +0200 |
| commit | fcff418411702dbe120e1281096794042b0e1d55 (patch) | |
| tree | bdef22acc41ad348854d4bd4d5bc5022a8e794dd /Zend/zend_language_scanner.l | |
| parent | 84a080ef506c9e8a2d20529a88ff6622ecbecc42 (diff) | |
| parent | 2cbc94097ebb1757d57ad02189bdbb7e2e1a7162 (diff) | |
| download | php-git-fcff418411702dbe120e1281096794042b0e1d55.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79934: CRLF-only line in heredoc causes parsing error
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 7f42159b46..ca5804f4bf 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1170,6 +1170,7 @@ static const char *next_newline(const char *str, const char *end, size_t *newlin for (; str < end; str++) { if (*str == '\r') { *newline_len = str + 1 < end && *(str + 1) == '\n' ? 2 : 1; + return str; } else if (*str == '\n') { *newline_len = 1; return str; |