MFZE1

diff --git a/Zend/flex.skl b/Zend/flex.skl
index 20ccb2113ce1617b7b211660b40c3768bfbea970..65ed5ca2a521c3f8d6e8456073ff256a6d1d7421 100644 (file)
--- a/Zend/flex.skl
+++ b/Zend/flex.skl
@@ -388,9 +388,14 @@ static int input YY_PROTO(( TSRMLS_D ));
 #endif
 
 #if YY_STACK_USED
+#define yy_start_stack_ptr SCNG(yy_start_stack_ptr)
+#define yy_start_stack_depth SCNG(yy_start_stack_depth)
+#define yy_start_stack SCNG(yy_start_stack)
+/*
 static int yy_start_stack_ptr = 0;
 static int yy_start_stack_depth = 0;
 static int *yy_start_stack = 0;
+*/
 #ifndef YY_NO_PUSH_STATE
 static void yy_push_state YY_PROTO(( int new_state TSRMLS_DC ));
 #endif
@@ -398,7 +403,7 @@ static void yy_push_state YY_PROTO(( int new_state TSRMLS_DC ));
 static void yy_pop_state YY_PROTO(( TSRMLS_D ));
 #endif
 #ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
+static int yy_top_state YY_PROTO(( TSRMLS_D ));
 #endif
 
 #else
@@ -1495,7 +1500,7 @@ void yyFlexLexer::yy_pop_state(TSRMLS_D)
 
 #ifndef YY_NO_TOP_STATE
 %-
-static int yy_top_state()
+static int yy_top_state(TSRMLS_D)
 %+
 int yyFlexLexer::yy_top_state()
 %*

diff --git a/Zend/zend.c b/Zend/zend.c
index 8871ce00e8546d2fbd19d1601433263320474593..a37274a1de98cf87d013ae87967056294ba137f1 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -380,7 +380,9 @@ static void scanner_globals_ctor(zend_scanner_globals *scanner_globals_p TSRMLS_
        scanner_globals_p->yy_out = NULL;
        scanner_globals_p->_yy_more_flag = 0;
        scanner_globals_p->_yy_more_len = 0;
-
+       scanner_globals_p->yy_start_stack_ptr = 0;
+       scanner_globals_p->yy_start_stack_depth = 0;
+       scanner_globals_p->yy_start_stack = 0;
 }
 
 

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index fa9cde9cf11b54bf0ff621df1c494bc6b44915fe..6de7392e1822782f6a6a4df5f113a9d793fa8749 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -255,6 +255,9 @@ struct _zend_scanner_globals {
        char *_yy_last_accepting_cpos;
        int _yy_more_flag;
        int _yy_more_len;
+       int yy_start_stack_ptr;
+       int yy_start_stack_depth;
+       int *yy_start_stack;
 };
 
 #endif /* ZEND_GLOBALS_H */

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 599b87b58e77a1b8cebcb30b2ee2ba128334fd9a..6baf43e40f349b0281a4661ed0dec57b9968ccb5 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -125,6 +125,9 @@ void startup_scanner(TSRMLS_D)
 {
        CG(heredoc) = NULL;
        CG(heredoc_len)=0;
+       SCNG(yy_start_stack_ptr) = 0;
+       SCNG(yy_start_stack_depth) = 0;
+       SCNG(yy_start_stack) = 0;
 }