Fixed bug #34782 (token_get_all() gives wrong result)

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 3d98eb1f2e4538ff92468a49c757b4a48f228810..093e9253d8a5967ae78f9961ec7548bbad94cb53 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1005,6 +1005,7 @@ int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_
        if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE) {
                return FAILURE;
        }
+       BEGIN(INITIAL);
        zend_highlight(syntax_highlighter_ini TSRMLS_CC);
        zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
        zval_dtor(str);

diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index 55cbfed97fc5d11a7aa9c0a9f9ba3a331f054fc7..4d2f78893c2bcd23807ddbf386124e110bdbc2ad 100644 (file)
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -521,6 +521,8 @@ PHP_FUNCTION(token_get_all)
                RETURN_EMPTY_STRING();
        }
 
+       LANG_SCNG(start) = 1;
+
        tokenize(return_value TSRMLS_CC);
        
        zend_restore_lexical_state(&original_lex_state TSRMLS_CC);