cvs: ZendEngine2(PHP_5_0) / zend_language_scanner.l

stas            Mon Jan  3 05:02:36 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /ZendEngine2        zend_language_scanner.l 
  Log:
  MFH:
  Fix the following nasty bug:
  - if compile bails out from the middle of compiling, current_buffer is not 
restored
  - if current_buffer is not null, yy_switch_to_buffer will do: *yy_c_buf_p = 
yy_hold_char; on
  the next request
  - which would lead to memory corruption on next request
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_language_scanner.l?r1=1.111.2.2&r2=1.111.2.3&ty=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.111.2.2 
ZendEngine2/zend_language_scanner.l:1.111.2.3
--- ZendEngine2/zend_language_scanner.l:1.111.2.2       Thu Dec 30 10:23:07 2004
+++ ZendEngine2/zend_language_scanner.l Mon Jan  3 05:02:36 2005
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.l,v 1.111.2.2 2004/12/30 15:23:07 sniper Exp $ */
+/* $Id: zend_language_scanner.l,v 1.111.2.3 2005/01/03 10:02:36 stas Exp $ */
 
 #define yyleng SCNG(yy_leng)
 #define yytext SCNG(yy_text)
@@ -128,6 +128,7 @@
        RESET_DOC_COMMENT();
        SCNG(yy_start_stack_ptr) = 0;
        SCNG(yy_start_stack_depth) = 0;
+       SCNG(current_buffer) = NULL;
 #ifdef ZEND_MULTIBYTE
        SCNG(script_org) = NULL;
        SCNG(script_org_size) = 0;

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php