diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-20 13:37:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-20 13:37:53 +0200 |
| commit | 1823b16fa15894f72fc01724766289dbecf5a62a (patch) | |
| tree | 1b7d21c15a1003a8c5631a15393d906c0ef3482f /ext/tokenizer/tokenizer.c | |
| parent | 9003cd142553384c3d271b12407186d5352868ad (diff) | |
| parent | 9ccf85419849db587a973673e382faf3b3a9db43 (diff) | |
| download | php-git-1823b16fa15894f72fc01724766289dbecf5a62a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Merging master to fix Windows build
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Diffstat (limited to 'ext/tokenizer/tokenizer.c')
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index c5cbf6c7d2..d22fd71243 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -138,11 +138,8 @@ static void tokenize(zval *return_value TSRMLS_DC) token_line = ++CG(zend_lineno); CG(increment_lineno) = 0; } - add_next_index_stringl(keyword, Z_STRVAL(token), Z_STRLEN(token), 1); - efree(Z_STRVAL(token)); - } else { - add_next_index_stringl(keyword, (char *)zendtext, zendleng, 1); } + add_next_index_stringl(keyword, (char *)zendtext, zendleng, 1); add_next_index_long(keyword, token_line); add_next_index_zval(return_value, keyword); } else { |