From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 21 Oct 2005 09:33:04 +0000 (+0000)
Subject: Fixed bug #34782 (token_get_all() gives wrong result)
X-Git-Tag: RELEASE_0_9_1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fd04023dcf28a9fc932a19a95d2a4794b637ed1;p=php

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

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 3d98eb1f2e..093e9253d8 100644
--- 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 55cbfed97f..4d2f78893c 100644
--- 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);