Fix implementation bug

tpunt · tpunt · commit 7185982c41ec · 2017-09-25T13:00:06.000+01:00
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
@@ -1851,7 +1851,7 @@ int start_line = CG(zend_lineno);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 2291 "Zend/zend_language_scanner.l"
 		{
-	int newline = 0, indentation, len, new_len, using_spaces, using_tabs;
+	int newline = 0, indentation = 0, len, new_len, using_spaces = 0, using_tabs = 0;
 
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));
 
@@ -1869,7 +1869,6 @@ int start_line = CG(zend_lineno);
 				}
 				/* fall through */
 			case '\n':
-				indentation = using_spaces = using_tabs = 0;
 				while (*YYCURSOR == ' ' || *YYCURSOR == '\t') {
 					using_spaces |= *YYCURSOR == ' ';
 					using_tabs |= *YYCURSOR == '\t';
@@ -1910,6 +1909,7 @@ int start_line = CG(zend_lineno);
 
 					goto heredoc_scan_done;
 				}
+				indentation = using_spaces = using_tabs = 0;
 				continue;
 			case '$':
 				if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -2289,7 +2289,7 @@ double_quotes_scan_done:
 
 
 <ST_HEREDOC>{ANY_CHAR} {
-	int newline = 0, indentation, len, new_len, using_spaces, using_tabs;
+	int newline = 0, indentation = 0, len, new_len, using_spaces = 0, using_tabs = 0;
 
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));
 
@@ -2307,7 +2307,6 @@ double_quotes_scan_done:
 				}
 				/* fall through */
 			case '\n':
-				indentation = using_spaces = using_tabs = 0;
 				while (*YYCURSOR == ' ' || *YYCURSOR == '\t') {
 					using_spaces |= *YYCURSOR == ' ';
 					using_tabs |= *YYCURSOR == '\t';
@@ -2348,6 +2347,7 @@ double_quotes_scan_done:
 
 					goto heredoc_scan_done;
 				}
+				indentation = using_spaces = using_tabs = 0;
 				continue;
 			case '$':
 				if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
