diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-28 21:30:15 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-28 21:30:15 +0200 |
| commit | 1593f79ecd2f718b5de7d9028084205595c6e509 (patch) | |
| tree | 2179134d7d293bbcb5abcb57144a67eb3e27f261 /ext/tokenizer/tokenizer.c | |
| parent | 38387d7cfcce7e3c5e1e9b730e78a5a8aea00311 (diff) | |
| parent | 7e0f7b7677e2fd76e83c2b731c3c0f3bd1a7279e (diff) | |
| download | php-git-1593f79ecd2f718b5de7d9028084205595c6e509.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/tokenizer/tokenizer.c')
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 48c358c941..cf5be94226 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -98,7 +98,11 @@ static void add_token(zval *return_value, int token_type, zval keyword; array_init(&keyword); add_next_index_long(&keyword, token_type); - add_next_index_stringl(&keyword, (char *) text, leng); + if (leng == 1) { + add_next_index_str(&keyword, ZSTR_CHAR(text[0])); + } else { + add_next_index_stringl(&keyword, (char *) text, leng); + } add_next_index_long(&keyword, lineno); add_next_index_zval(return_value, &keyword); } else { |